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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4d8beb932f701c17c1879017286a2ae2f9342d47
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 19 10:52:40 2011 +0100

    Refresh 01-cdda2wav_to_icedax.patch patch.

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 79b64d3..1625c4d 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
-@@ -2578,9 +2578,9 @@ if (defined($ARGV[0])) {
+@@ -2605,9 +2605,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");
-@@ -2595,7 +2595,7 @@ if (defined($ARGV[0])) {
+@@ -2622,7 +2622,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
-@@ -1059,7 +1059,7 @@ create_LiVES (void)
+@@ -1076,7 +1076,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);
      }
-@@ -2528,7 +2528,7 @@ create_LiVES (void)
+@@ -2546,7 +2546,7 @@ create_LiVES (void)
    g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
                        G_CALLBACK (on_load_audio_activate),
                        NULL);
@@ -68,10 +68,10 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1296,8 +1296,8 @@ void do_start_messages(void) {
+@@ -1343,8 +1343,8 @@ void do_start_messages(void) {
+   else d_print(_ ("composite...NOT DETECTED..."));
+   if (capable->has_sox) d_print(_ ("sox...detected\n"));
    else d_print(_ ("sox...NOT DETECTED\n"));
-   if (capable->has_xmms) d_print(_ ("xmms...detected..."));
-   else d_print(_ ("xmms...NOT DETECTED..."));
 -  if (capable->has_cdda2wav) d_print(_ ("cdda2wav...detected..."));
 -  else d_print(_ ("cdda2wav...NOT DETECTED..."));
 +  if (capable->has_icedax) d_print(_ ("icedax...detected..."));
@@ -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..."));
-@@ -1484,7 +1484,7 @@ capability *get_capabilities (void) {
+@@ -1531,7 +1531,7 @@ capability *get_capabilities (void) {
    capable->has_sox=FALSE;
    capable->has_xmms=FALSE;
    capable->has_dvgrab=FALSE;
@@ -88,7 +88,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    capable->has_jackd=FALSE;
    capable->has_gdb=FALSE;
    capable->has_pulse_audio=FALSE;
-@@ -1596,8 +1596,8 @@ capability *get_capabilities (void) {
+@@ -1643,8 +1643,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;
-@@ -2212,7 +2212,7 @@ void sensitize(void) {
+@@ -2284,7 +2284,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
-@@ -539,7 +539,7 @@ typedef struct {
+@@ -530,7 +530,7 @@ typedef struct {
    gboolean has_mplayer;
    gboolean has_convert;
    gboolean has_composite;
@@ -121,7 +121,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gboolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -4186,7 +4186,7 @@ _prefsw *create_prefs_dialog (void) {
+@@ -4215,7 +4215,7 @@ _prefsw *create_prefs_dialog (void) {
  
     g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry);
  

-- 
lives packaging