[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 03969ee415838955789d5530528c192843604773
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Sep 15 09:23:16 2010 +0200

    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 97b3525..af4f847 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
-@@ -2559,9 +2559,9 @@ if (defined($ARGV[0])) {
+@@ -2578,9 +2578,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");
-@@ -2576,7 +2576,7 @@ if (defined($ARGV[0])) {
+@@ -2595,7 +2595,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
-@@ -1295,8 +1295,8 @@ void do_start_messages(void) {
+@@ -1296,8 +1296,8 @@ void do_start_messages(void) {
    else d_print(_ ("sox...NOT DETECTED\n"));
    if (capable->has_xmms) d_print(_ ("xmms...detected..."));
    else d_print(_ ("xmms...NOT 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..."));
-@@ -1483,7 +1483,7 @@ capability *get_capabilities (void) {
+@@ -1484,7 +1484,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;
-@@ -1595,8 +1595,8 @@ capability *get_capabilities (void) {
+@@ -1596,8 +1596,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;
-@@ -2204,7 +2204,7 @@ void sensitize(void) {
+@@ -2212,7 +2212,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);

-- 
lives packaging