[SCM] lives/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 915a6e6276c3beed2a0926817b60321482b09ed3
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Dec 16 09:06:21 2011 +0100

    Refresh patches.

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 8bfa861..ecf2ee4 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
-@@ -2735,9 +2735,9 @@ if (defined($ARGV[0])) {
+@@ -2772,9 +2772,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");
-@@ -2752,7 +2752,7 @@ if (defined($ARGV[0])) {
+@@ -2789,7 +2789,7 @@ if (defined($ARGV[0])) {
  	    unlink $audiofile;
  	}
  
@@ -48,7 +48,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	$arate=44100;
 --- lives.orig/src/gui.c
 +++ lives/src/gui.c
-@@ -1130,7 +1130,7 @@ create_LiVES (void)
+@@ -1156,7 +1156,7 @@ 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);
      }
-@@ -2585,7 +2585,7 @@ create_LiVES (void)
+@@ -2617,7 +2617,7 @@ create_LiVES (void)
    g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
                        G_CALLBACK (on_load_audio_activate),
                        NULL);
@@ -99,7 +99,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
    get_location("jackd",string,256);
    if (strlen(string)) capable->has_jackd=TRUE;
-@@ -2394,7 +2394,7 @@ void sensitize(void) {
+@@ -2398,7 +2398,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,7 +110,7 @@ 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
-@@ -534,7 +534,7 @@ typedef struct {
+@@ -530,7 +530,7 @@ typedef struct {
    gboolean has_mplayer;
    gboolean has_convert;
    gboolean has_composite;
@@ -121,9 +121,9 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gboolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -4539,7 +4539,7 @@ _prefsw *create_prefs_dialog (void) {
- 
-    g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry);
+@@ -4540,7 +4540,7 @@ _prefsw *create_prefs_dialog (void) {
+    g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",
+ 		     G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry);
  
 -   if (capable->has_cdda2wav) {
 +   if (capable->has_icedax) {
diff --git a/debian/patches/02-drop_py3_multiencoder.patch b/debian/patches/02-drop_py3_multiencoder.patch
index dbd24fe..9a01a71 100644
--- a/debian/patches/02-drop_py3_multiencoder.patch
+++ b/debian/patches/02-drop_py3_multiencoder.patch
@@ -19,7 +19,7 @@ Forwarded: not-needed
  transcode_encoder \
 --- lives.orig/lives-plugins/plugins/encoders/Makefile.in
 +++ lives/lives-plugins/plugins/encoders/Makefile.in
-@@ -325,7 +325,6 @@ ffmpeg_encoder \
+@@ -333,7 +333,6 @@ ffmpeg_encoder \
  mencoder_encoder \
  mjpegtools_encoder \
  multi_encoder \

-- 
lives packaging