[SCM] lives/master: Refresh debian/patches/01-cdda2wav_to_icedax.patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9ffbd7e3b549015346628e92c579c44ce92e5f78
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jun 26 09:29:50 2012 +0200

    Refresh debian/patches/01-cdda2wav_to_icedax.patch.

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 6cea1e6..bfd57ab 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -24,7 +24,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
 --- lives.orig/smogrify
 +++ lives/smogrify
-@@ -3155,9 +3155,9 @@ if (defined($ARGV[0])) {
+@@ -3493,9 +3493,9 @@ if (defined($ARGV[0])) {
  
      if ($command eq "cdopen") {
  
@@ -37,12 +37,12 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	}
  
  	$cdplay_device=&rc_get("cdplay_device");
-@@ -3172,7 +3172,7 @@ if (defined($ARGV[0])) {
+@@ -3510,7 +3510,7 @@ if (defined($ARGV[0])) {
  	    unlink "$audiofile";
  	}
  
--	$com="$cdda2wav_command -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >/dev/null 2>&1";
-+	$com="$icedax_command -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >/dev/null 2>&1";
+-	$com="\"$cdda2wav_command\" -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >$nulfile 2>&1";
++	$com="\"$icedax_command\" -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >$nulfile 2>&1";
  	$smerr=smog_system($com);
  	if ($smerr) {
  	    sig_system_error("$com",$smerr);
@@ -68,9 +68,9 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1530,8 +1530,8 @@ void do_start_messages(void) {
+@@ -1578,8 +1578,8 @@ void do_start_messages(void) {
    else d_print(_ ("composite...NOT DETECTED..."));
-   if (capable->has_sox) d_print(_ ("sox...detected\n"));
+   if (capable->has_sox_sox) d_print(_ ("sox...detected\n"));
    else d_print(_ ("sox...NOT DETECTED\n"));
 -  if (capable->has_cdda2wav) d_print(_ ("cdda2wav...detected..."));
 -  else d_print(_ ("cdda2wav...NOT DETECTED..."));
@@ -79,8 +79,8 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    if (capable->has_jackd) d_print(_ ("jackd...detected..."));
    else d_print(_ ("jackd...NOT DETECTED..."));
    if (capable->has_pulse_audio) d_print(_ ("pulse audio...detected..."));
-@@ -1738,7 +1738,7 @@ capability *get_capabilities (void) {
-   capable->has_sox=FALSE;
+@@ -1816,7 +1816,7 @@ capability *get_capabilities (void) {
+   capable->has_sox_sox=FALSE;
    capable->has_xmms=FALSE;
    capable->has_dvgrab=FALSE;
 -  capable->has_cdda2wav=FALSE;
@@ -88,7 +88,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    capable->has_autolives=FALSE;
    capable->has_jackd=FALSE;
    capable->has_gdb=FALSE;
-@@ -1867,8 +1867,8 @@ capability *get_capabilities (void) {
+@@ -1979,8 +1979,8 @@ capability *get_capabilities (void) {
    get_location("dvgrab",string,256);
    if (strlen(string)) capable->has_dvgrab=TRUE;
  
@@ -99,7 +99,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
    get_location("jackd",string,256);
    if (strlen(string)) capable->has_jackd=TRUE;
-@@ -2672,7 +2672,7 @@ void sensitize(void) {
+@@ -2870,7 +2870,7 @@ void sensitize(void) {
    gtk_widget_set_sensitive (mainw->load_audio, TRUE);
    gtk_widget_set_sensitive (mainw->load_subs, mainw->current_file>0);
    gtk_widget_set_sensitive (mainw->erase_subs, mainw->current_file>0&&cfile->subt!=NULL);
@@ -110,10 +110,10 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gtk_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
 --- lives.orig/src/main.h
 +++ lives/src/main.h
-@@ -568,7 +568,7 @@ typedef struct {
-   gboolean has_mplayer;
+@@ -623,7 +623,7 @@ typedef struct {
    gboolean has_convert;
    gboolean has_composite;
+   gboolean has_identify;
 -  gboolean has_cdda2wav;
 +  gboolean has_icedax;
    gboolean has_midistartstop;
@@ -121,7 +121,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gboolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -4824,7 +4824,7 @@ _prefsw *create_prefs_dialog (void) {
+@@ -4885,7 +4885,7 @@ _prefsw *create_prefs_dialog (void) {
    g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",
  		    G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry);
  

-- 
lives packaging