[SCM] lives/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f5a425ba561b5b0e1848441e401a0ead7b41461b
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 26 10:33:33 2012 +0100

    Refresh

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index ecf2ee4..8829ea5 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -13,18 +13,18 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
 
 --- lives.orig/README
 +++ lives/README
-@@ -34,7 +34,7 @@ mencoder (highly recommended)
- libmjpeg-tools (recommended)
- 
- xmms (optional)
--cdda2wav (optional)
-+icedax (optional)
- 
+@@ -33,7 +33,7 @@ libmjpeg-tools (recommended)
+ *Highly* Recommended runtime dependencies include:
+ theora-bin, mkvtoolnix, vorbis-tools, mencoder,
+ libmatroska, ogmtools, dvgrab, x264, ffmpeg,
+-libdv2-apps/libdv-bin, cdda2wav, lame, python, youtube-dl
++libdv2-apps/libdv-bin, icedax, lame, python, youtube-dl
  
+ Optional -  libvisual-actors, frei0r-plugins
  
 --- lives.orig/smogrify
 +++ lives/smogrify
-@@ -2772,9 +2772,9 @@ if (defined($ARGV[0])) {
+@@ -3152,9 +3152,9 @@ if (defined($ARGV[0])) {
  
      if ($command eq "cdopen") {
  
@@ -37,15 +37,15 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	}
  
  	$cdplay_device=&rc_get("cdplay_device");
-@@ -2789,7 +2789,7 @@ if (defined($ARGV[0])) {
- 	    unlink $audiofile;
+@@ -3169,7 +3169,7 @@ if (defined($ARGV[0])) {
+ 	    unlink "$audiofile";
  	}
  
--	system("$cdda2wav_command -q -x -D $cdplay_device -t $track $audiofile >/dev/null 2>&1");
-+	system("$icedax_command -q -x -D $cdplay_device -t $track $audiofile >/dev/null 2>&1");
- 	$f_size=-s $audiofile;
- 	# the '-x' option will force these
- 	$arate=44100;
+-	$com="$cdda2wav_command -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >/dev/null 2>&1";
++	$com="$icedax_command -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >/dev/null 2>&1";
+ 	$smerr=smog_system($com);
+ 	if ($smerr) {
+ 	    sig_system_error("$com",$smerr);
 --- lives.orig/src/gui.c
 +++ lives/src/gui.c
 @@ -1156,7 +1156,7 @@ create_LiVES (void)
@@ -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);
      }
-@@ -2617,7 +2617,7 @@ create_LiVES (void)
+@@ -2678,7 +2678,7 @@ create_LiVES (void)
    g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
                        G_CALLBACK (on_load_audio_activate),
                        NULL);
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1395,8 +1395,8 @@ void do_start_messages(void) {
+@@ -1531,8 +1531,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,16 +79,16 @@ 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..."));
-@@ -1596,7 +1596,7 @@ capability *get_capabilities (void) {
+@@ -1739,7 +1739,7 @@ capability *get_capabilities (void) {
    capable->has_sox=FALSE;
    capable->has_xmms=FALSE;
    capable->has_dvgrab=FALSE;
 -  capable->has_cdda2wav=FALSE;
 +  capable->has_icedax=FALSE;
+   capable->has_autolives=FALSE;
    capable->has_jackd=FALSE;
    capable->has_gdb=FALSE;
-   capable->has_pulse_audio=FALSE;
-@@ -1708,8 +1708,8 @@ capability *get_capabilities (void) {
+@@ -1865,8 +1865,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;
-@@ -2398,7 +2398,7 @@ void sensitize(void) {
+@@ -2656,7 +2656,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
-@@ -530,7 +530,7 @@ typedef struct {
+@@ -584,7 +584,7 @@ typedef struct {
    gboolean has_mplayer;
    gboolean has_convert;
    gboolean has_composite;
@@ -121,12 +121,12 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    gboolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -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);
+@@ -4849,7 +4849,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) {
-      gtk_widget_show (prefsw->cdplay_entry);
-      gtk_widget_show (hbox19);
-    }
+-  if (capable->has_cdda2wav) {
++  if (capable->has_icedax) {
+     gtk_widget_show (prefsw->cdplay_entry);
+     gtk_widget_show (hbox19);
+   }

-- 
lives packaging