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

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Jun 4 05:28:23 UTC 2015 

The following commit has been merged in the master branch:
commit 142a648b359c48dd04bf7680f72f63604e80118b
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jun 4 06:27:02 2015 +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 e3cbdb0..eaa7a25 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -24,62 +24,62 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
 --- lives.orig/smogrify
 +++ lives/smogrify
-@@ -3598,9 +3598,9 @@ if (defined($ARGV[0])) {
+@@ -3566,9 +3566,9 @@ if ($file=~/:\/\//) {
  
      if ($command eq "cdopen") {
  
--	$cdda2wav_command=&location("cdda2wav");
--	if ($cdda2wav_command eq "") {
--	    &sig_error("cdda2wav is required for this function.","Please install it first.");
-+	$icedax_command=&location("icedax");
-+	if ($icedax_command eq "") {
-+	    &sig_error("icedax is required for this function.","Please install it first.");
- 	}
+-        $cdda2wav_command=&location("cdda2wav");
+-        if ($cdda2wav_command eq "") {
+-            &sig_error("cdda2wav is required for this function.","Please install it first.");
++        $icedax_command=&location("icedax");
++        if ($icedax_command eq "") {
++            &sig_error("icedax is required for this function.","Please install it first.");
+         }
  
- 	$cdplay_device=&rc_get("cdplay_device");
-@@ -3615,7 +3615,7 @@ if (defined($ARGV[0])) {
- 	    unlink "$audiofile";
- 	}
+         $cdplay_device=&rc_get("cdplay_device");
+@@ -3583,7 +3583,7 @@ if ($file=~/:\/\//) {
+             unlink "$audiofile";
+         }
  
--	$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);
+-        $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);
 --- lives.orig/src/gui.c
 +++ lives/src/gui.c
-@@ -1193,7 +1193,7 @@ void create_LiVES (void) {
-   lives_container_add (LIVES_CONTAINER (audio_menu), mainw->eject_cd);
+@@ -1192,7 +1192,7 @@ void create_LiVES(void) {
+   lives_container_add(LIVES_CONTAINER(audio_menu), mainw->eject_cd);
  
    if (capable->smog_version_correct) {
--    if (!(capable->has_cdda2wav&&strlen (prefs->cdplay_device))) {
-+    if (!(capable->has_icedax&&strlen (prefs->cdplay_device))) {
-       lives_widget_set_sensitive (mainw->load_cdtrack, FALSE);
-       lives_widget_set_sensitive (mainw->eject_cd, FALSE);
+-    if (!(capable->has_cdda2wav&&strlen(prefs->cdplay_device))) {
++    if (!(capable->has_icedax&&strlen(prefs->cdplay_device))) {
+       lives_widget_set_sensitive(mainw->load_cdtrack, FALSE);
+       lives_widget_set_sensitive(mainw->eject_cd, FALSE);
      }
-@@ -2815,7 +2815,7 @@ void create_LiVES (void) {
-   lives_signal_connect (LIVES_GUI_OBJECT (mainw->load_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-                       LIVES_GUI_CALLBACK (on_load_audio_activate),
-                       NULL);
+@@ -2829,7 +2829,7 @@ void create_LiVES(void) {
+   lives_signal_connect(LIVES_GUI_OBJECT(mainw->load_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                        LIVES_GUI_CALLBACK(on_load_audio_activate),
+                        NULL);
 -  if (capable->has_cdda2wav) {
 +  if (capable->has_icedax) {
-     lives_signal_connect (LIVES_GUI_OBJECT (mainw->load_cdtrack), LIVES_WIDGET_ACTIVATE_EVENT,
-                       LIVES_GUI_CALLBACK (on_load_cdtrack_activate),
-                       NULL);
+     lives_signal_connect(LIVES_GUI_OBJECT(mainw->load_cdtrack), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                          LIVES_GUI_CALLBACK(on_load_cdtrack_activate),
+                          NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1773,8 +1773,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"));
--  if (capable->has_cdda2wav) d_print(_ ("cdda2wav...detected..."));
--  else d_print(_ ("cdda2wav...NOT DETECTED..."));
-+  if (capable->has_icedax) d_print(_ ("icedax...detected..."));
-+  else d_print(_ ("icedax...NOT DETECTED..."));
-   if (capable->has_jackd) d_print(_ ("jackd...detected..."));
-   else d_print(_ ("jackd...NOT DETECTED..."));
-   if (capable->has_pulse_audio) d_print(_ ("pulse audio...detected..."));
-@@ -2066,7 +2066,7 @@ capability *get_capabilities (void) {
+@@ -1833,8 +1833,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"));
+-  if (capable->has_cdda2wav) d_print(_("cdda2wav...detected..."));
+-  else d_print(_("cdda2wav...NOT DETECTED..."));
++  if (capable->has_icedax) d_print(_("icedax...detected..."));
++  else d_print(_("icedax...NOT DETECTED..."));
+   if (capable->has_jackd) d_print(_("jackd...detected..."));
+   else d_print(_("jackd...NOT DETECTED..."));
+   if (capable->has_pulse_audio) d_print(_("pulse audio...detected..."));
+@@ -2129,7 +2129,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;
-@@ -2229,8 +2229,8 @@ capability *get_capabilities (void) {
+@@ -2291,8 +2291,8 @@ capability *get_capabilities(void) {
    get_location("dvgrab",string,256);
    if (strlen(string)) capable->has_dvgrab=TRUE;
  
@@ -99,18 +99,18 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
    get_location("jackd",string,256);
    if (strlen(string)) capable->has_jackd=TRUE;
-@@ -3192,7 +3192,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);
--  if (capable->has_cdda2wav&&strlen (prefs->cdplay_device)) lives_widget_set_sensitive (mainw->load_cdtrack, TRUE);
-+  if (capable->has_icedax&&strlen (prefs->cdplay_device)) lives_widget_set_sensitive (mainw->load_cdtrack, TRUE);
-   lives_widget_set_sensitive (mainw->rename, mainw->current_file>0&&!cfile->opening);
-   lives_widget_set_sensitive (mainw->change_speed, mainw->current_file>0);
-   lives_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
+@@ -3315,7 +3315,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);
+-  if (capable->has_cdda2wav&&strlen(prefs->cdplay_device)) lives_widget_set_sensitive(mainw->load_cdtrack, TRUE);
++  if (capable->has_icedax&&strlen(prefs->cdplay_device)) lives_widget_set_sensitive(mainw->load_cdtrack, TRUE);
+   lives_widget_set_sensitive(mainw->rename, mainw->current_file>0&&!cfile->opening);
+   lives_widget_set_sensitive(mainw->change_speed, mainw->current_file>0);
+   lives_widget_set_sensitive(mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
 --- lives.orig/src/main.h
 +++ lives/src/main.h
-@@ -662,7 +662,7 @@ typedef struct {
+@@ -676,7 +676,7 @@ typedef struct {
    boolean has_convert;
    boolean has_composite;
    boolean has_identify;
@@ -121,30 +121,30 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    boolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -998,7 +998,7 @@ lives_toggle_button_get_active(LIVES_TOG
+@@ -1053,7 +1053,7 @@ boolean apply_prefs(boolean skip_warn) {
    }
  
    // 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);
+       lives_snprintf(prefs->cdplay_device,256,"%s",cdplay_device);
        set_pref("cdplay_device",prefs->cdplay_device);
-@@ -1878,7 +1878,7 @@ void on_prefDomainChanged(LiVESTreeSelec
+@@ -1911,7 +1911,7 @@ void on_prefDomainChanged(LiVESTreeSelec
        case LIST_ENTRY_MISC:
- 	lives_widget_show_all(prefsw->scrollw_right_misc);
- 	prefsw->right_shown = prefsw->scrollw_right_misc;
--	if (!capable->has_cdda2wav) {
-+	if (!capable->has_icedax) {
- 	  lives_widget_hide (prefsw->cdda_hbox);
- 	}
- 	break;
-@@ -3758,7 +3758,7 @@ _prefsw *create_prefs_dialog (void) {
-   lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
+         lives_widget_show_all(prefsw->scrollw_right_misc);
+         prefsw->right_shown = prefsw->scrollw_right_misc;
+-        if (!capable->has_cdda2wav) {
++        if (!capable->has_icedax) {
+           lives_widget_hide(prefsw->cdda_hbox);
+         }
+         break;
+@@ -3826,7 +3826,7 @@ _prefsw *create_prefs_dialog(void) {
+   lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_misc);
  
  
 -  if (!capable->has_cdda2wav) {
 +  if (!capable->has_icedax) {
-     lives_widget_hide (prefsw->cdda_hbox);
+     lives_widget_hide(prefsw->cdda_hbox);
    }
-    
+ 

-- 
lives packaging

More information about the pkg-multimedia-commits mailing list