[SCM] lives/master: Refresh patchset.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e44912840295f8a95f010d590e9c42f69151839d
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jul 6 12:09:49 2014 +0100

    Refresh patchset.

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 1dadb6e..7c897bf 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
-@@ -3538,9 +3538,9 @@ if (defined($ARGV[0])) {
+@@ -3540,9 +3540,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");
-@@ -3555,7 +3555,7 @@ if (defined($ARGV[0])) {
+@@ -3557,7 +3557,7 @@ if (defined($ARGV[0])) {
  	    unlink "$audiofile";
  	}
  
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1747,8 +1747,8 @@ void do_start_messages(void) {
+@@ -1757,8 +1757,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..."));
-@@ -2039,7 +2039,7 @@ capability *get_capabilities (void) {
+@@ -2050,7 +2050,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;
-@@ -2199,8 +2199,8 @@ capability *get_capabilities (void) {
+@@ -2213,8 +2213,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;
-@@ -3155,7 +3155,7 @@ void sensitize(void) {
+@@ -3173,7 +3173,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);
@@ -110,7 +110,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    lives_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
 --- lives.orig/src/main.h
 +++ lives/src/main.h
-@@ -679,7 +679,7 @@ typedef struct {
+@@ -680,7 +680,7 @@ typedef struct {
    boolean has_convert;
    boolean has_composite;
    boolean has_identify;
@@ -121,7 +121,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    boolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -981,7 +981,7 @@ lives_toggle_button_get_active(LIVES_TOG
+@@ -982,7 +982,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);
-@@ -1856,7 +1856,7 @@ void on_prefDomainChanged(GtkTreeSelecti
+@@ -1862,7 +1862,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;
-@@ -3728,7 +3728,7 @@ _prefsw *create_prefs_dialog (void) {
+@@ -3742,7 +3742,7 @@ _prefsw *create_prefs_dialog (void) {
    lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
  
  

-- 
lives packaging