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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fcaf741e9ea46868b85b97b8b5fa00146c2fdf6d
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jun 29 23:03:05 2013 +0100

    Refresh 01-cdda2wav_to_icedax.patch.

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index f3d9f64..fee7cb2 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1696,8 +1696,8 @@ void do_start_messages(void) {
+@@ -1708,8 +1708,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,7 +79,7 @@ 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..."));
-@@ -1981,7 +1981,7 @@ capability *get_capabilities (void) {
+@@ -1993,7 +1993,7 @@ capability *get_capabilities (void) {
    capable->has_sox_play=FALSE;
    capable->has_sox_sox=FALSE;
    capable->has_dvgrab=FALSE;
@@ -88,7 +88,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    capable->has_autolives=FALSE;
    capable->has_jackd=FALSE;
    capable->has_gdb=FALSE;
-@@ -2141,8 +2141,8 @@ capability *get_capabilities (void) {
+@@ -2153,8 +2153,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;
-@@ -3096,7 +3096,7 @@ void sensitize(void) {
+@@ -3108,7 +3108,7 @@ void sensitize(void) {
    lives_widget_set_sensitive (mainw->load_audio, TRUE);
    lives_widget_set_sensitive (mainw->load_subs, mainw->current_file>0);
    lives_widget_set_sensitive (mainw->erase_subs, mainw->current_file>0&&cfile->subt!=NULL);
@@ -121,7 +121,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    boolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -962,7 +962,7 @@ lives_toggle_button_get_active(LIVES_TOG
+@@ -966,7 +966,7 @@ lives_toggle_button_get_active(LIVES_TOG
    }
  
    // cd play device
@@ -130,7 +130,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
      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
+@@ -1827,7 +1827,7 @@ void on_prefDomainChanged(GtkTreeSelecti
        case LIST_ENTRY_MISC:
  	lives_widget_show_all(prefsw->scrollw_right_misc);
  	prefsw->right_shown = prefsw->scrollw_right_misc;
@@ -139,7 +139,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	  lives_widget_hide (prefsw->cdda_hbox);
  	}
  	break;
-@@ -3675,7 +3675,7 @@ _prefsw *create_prefs_dialog (void) {
+@@ -3657,7 +3657,7 @@ _prefsw *create_prefs_dialog (void) {
    lives_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
  
  

-- 
lives packaging