[SCM] lives/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ba976e854f53c32e50d0ce254bdfb922b443e8b3
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Oct 8 10:36:01 2013 +0100

    Refresh patches.

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index fee7cb2..3d084e2 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
-@@ -3535,9 +3535,9 @@ if (defined($ARGV[0])) {
+@@ -3537,9 +3537,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");
-@@ -3552,7 +3552,7 @@ if (defined($ARGV[0])) {
+@@ -3554,7 +3554,7 @@ if (defined($ARGV[0])) {
  	    unlink "$audiofile";
  	}
  
@@ -48,8 +48,8 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	    sig_system_error("$com",$smerr);
 --- lives.orig/src/gui.c
 +++ lives/src/gui.c
-@@ -1195,7 +1195,7 @@ void create_LiVES (void) {
-   lives_container_add (GTK_CONTAINER (audio_menu), mainw->eject_cd);
+@@ -1199,7 +1199,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))) {
@@ -57,7 +57,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
        lives_widget_set_sensitive (mainw->load_cdtrack, FALSE);
        lives_widget_set_sensitive (mainw->eject_cd, FALSE);
      }
-@@ -2807,7 +2807,7 @@ void create_LiVES (void) {
+@@ -2825,7 +2825,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
-@@ -1708,8 +1708,8 @@ void do_start_messages(void) {
+@@ -1726,8 +1726,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..."));
-@@ -1993,7 +1993,7 @@ capability *get_capabilities (void) {
+@@ -2011,7 +2011,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;
-@@ -2153,8 +2153,8 @@ capability *get_capabilities (void) {
+@@ -2171,8 +2171,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;
-@@ -3108,7 +3108,7 @@ void sensitize(void) {
+@@ -3125,7 +3125,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
-@@ -966,7 +966,7 @@ lives_toggle_button_get_active(LIVES_TOG
+@@ -973,7 +973,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);
-@@ -1827,7 +1827,7 @@ void on_prefDomainChanged(GtkTreeSelecti
+@@ -1846,7 +1846,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,8 +139,8 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	  lives_widget_hide (prefsw->cdda_hbox);
  	}
  	break;
-@@ -3657,7 +3657,7 @@ _prefsw *create_prefs_dialog (void) {
-   lives_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
+@@ -3692,7 +3692,7 @@ _prefsw *create_prefs_dialog (void) {
+   lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
  
  
 -  if (!capable->has_cdda2wav) {

-- 
lives packaging