[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 ebb3e6cca32c004f830daae1555d0140d4208cb0
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Apr 7 15:46:50 2013 +0100

    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 369e031..2db1c54 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -8,8 +8,8 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  src/gui.c         |    4 ++--
  src/main.c        |   12 ++++++------
  src/main.h        |    2 +-
- src/preferences.c |    2 +-
- 6 files changed, 15 insertions(+), 15 deletions(-)
+ src/preferences.c |    6 +++---
+ 6 files changed, 17 insertions(+), 17 deletions(-)
 
 --- lives.orig/README
 +++ lives/README
@@ -24,7 +24,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
 --- lives.orig/smogrify
 +++ lives/smogrify
-@@ -3540,9 +3540,9 @@ if (defined($ARGV[0])) {
+@@ -3535,9 +3535,9 @@ if (defined($ARGV[0])) {
  
      if ($command eq "cdopen") {
  
@@ -37,7 +37,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	}
  
  	$cdplay_device=&rc_get("cdplay_device");
-@@ -3557,7 +3557,7 @@ if (defined($ARGV[0])) {
+@@ -3552,7 +3552,7 @@ if (defined($ARGV[0])) {
  	    unlink "$audiofile";
  	}
  
@@ -48,7 +48,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	    sig_system_error("$com",$smerr);
 --- lives.orig/src/gui.c
 +++ lives/src/gui.c
-@@ -1157,7 +1157,7 @@ create_LiVES (void)
+@@ -1195,7 +1195,7 @@ void create_LiVES (void) {
    gtk_container_add (GTK_CONTAINER (audio_menu), mainw->eject_cd);
  
    if (capable->smog_version_correct) {
@@ -57,7 +57,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
        gtk_widget_set_sensitive (mainw->load_cdtrack, FALSE);
        gtk_widget_set_sensitive (mainw->eject_cd, FALSE);
      }
-@@ -2680,7 +2680,7 @@ create_LiVES (void)
+@@ -2807,7 +2807,7 @@ void create_LiVES (void) {
    g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
                        G_CALLBACK (on_load_audio_activate),
                        NULL);
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1639,8 +1639,8 @@ void do_start_messages(void) {
+@@ -1695,8 +1695,8 @@ void do_start_messages(void) {
    else d_print(_ ("composite...NOT DETECTED..."));
    if (capable->has_sox_sox) d_print(_ ("sox...detected\n"));
    else d_print(_ ("sox...NOT DETECTED\n"));
@@ -79,16 +79,16 @@ 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..."));
-@@ -1877,7 +1877,7 @@ capability *get_capabilities (void) {
+@@ -1980,7 +1980,7 @@ capability *get_capabilities (void) {
+   capable->has_sox_play=FALSE;
    capable->has_sox_sox=FALSE;
-   capable->has_xmms=FALSE;
    capable->has_dvgrab=FALSE;
 -  capable->has_cdda2wav=FALSE;
 +  capable->has_icedax=FALSE;
    capable->has_autolives=FALSE;
    capable->has_jackd=FALSE;
    capable->has_gdb=FALSE;
-@@ -2040,8 +2040,8 @@ capability *get_capabilities (void) {
+@@ -2140,8 +2140,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;
-@@ -2939,7 +2939,7 @@ void sensitize(void) {
+@@ -3095,7 +3095,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,23 +110,41 @@ 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
-@@ -626,7 +626,7 @@ typedef struct {
-   gboolean has_convert;
-   gboolean has_composite;
-   gboolean has_identify;
--  gboolean has_cdda2wav;
-+  gboolean has_icedax;
-   gboolean has_midistartstop;
-   gboolean has_jackd;
-   gboolean has_pulse_audio;
+@@ -678,7 +678,7 @@ typedef struct {
+   boolean has_convert;
+   boolean has_composite;
+   boolean has_identify;
+-  boolean has_cdda2wav;
++  boolean has_icedax;
+   boolean has_midistartstop;
+   boolean has_jackd;
+   boolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -4680,7 +4680,7 @@ _prefsw *create_prefs_dialog (void) {
-   g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",
- 		    G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry);
+@@ -962,7 +962,7 @@ lives_toggle_button_get_active(LIVES_TOG
+   }
  
--  if (capable->has_cdda2wav) {
-+  if (capable->has_icedax) {
-     gtk_widget_show (prefsw->cdplay_entry);
-     gtk_widget_show (hbox19);
+   // cd play device
+-  if (!capable->has_cdda2wav) {
++  if (!capable->has_icedax) {
+     if (strcmp(prefs->cdplay_device,cdplay_device)) {
+       g_snprintf(prefs->cdplay_device,256,"%s",cdplay_device);
+       set_pref("cdplay_device",prefs->cdplay_device);
+@@ -1823,7 +1823,7 @@ void on_prefDomainChanged(GtkTreeSelecti
+       case LIST_ENTRY_MISC:
+ 	gtk_widget_show_all(prefsw->scrollw_right_misc);
+ 	prefsw->right_shown = prefsw->scrollw_right_misc;
+-	if (!capable->has_cdda2wav) {
++	if (!capable->has_icedax) {
+ 	  gtk_widget_hide (prefsw->cdda_hbox);
+ 	}
+ 	break;
+@@ -3675,7 +3675,7 @@ _prefsw *create_prefs_dialog (void) {
+   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
+ 
+ 
+-  if (!capable->has_cdda2wav) {
++  if (!capable->has_icedax) {
+     gtk_widget_hide (prefsw->cdda_hbox);
    }
+    

-- 
lives packaging