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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fa3bfe9ac552d5988ae12cf274df582c7600ef0d
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 30 09:24:49 2011 +0200

    Refresh 01-cdda2wav_to_icedax.patch.

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 1625c4d..19e4b11 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1343,8 +1343,8 @@ void do_start_messages(void) {
+@@ -1348,8 +1348,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"));
@@ -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..."));
-@@ -1531,7 +1531,7 @@ capability *get_capabilities (void) {
+@@ -1536,7 +1536,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;
-@@ -1643,8 +1643,8 @@ capability *get_capabilities (void) {
+@@ -1648,8 +1648,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;
-@@ -2284,7 +2284,7 @@ void sensitize(void) {
+@@ -2297,7 +2297,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