[SCM] lives/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b52f6c003037e5a7133b4b216d251ecc77af0dc9
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 6 08:46:58 2013 +0200

    Refresh

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 2db1c54..bb957e4 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -49,13 +49,13 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
 --- lives.orig/src/gui.c
 +++ lives/src/gui.c
 @@ -1195,7 +1195,7 @@ void create_LiVES (void) {
-   gtk_container_add (GTK_CONTAINER (audio_menu), mainw->eject_cd);
+   lives_container_add (GTK_CONTAINER (audio_menu), mainw->eject_cd);
  
    if (capable->smog_version_correct) {
 -    if (!(capable->has_cdda2wav&&strlen (prefs->cdplay_device))) {
-+    if (!(capable->has_icedax&&strlen (prefs->cdplay_device))) {
-       gtk_widget_set_sensitive (mainw->load_cdtrack, FALSE);
-       gtk_widget_set_sensitive (mainw->eject_cd, FALSE);
++    if (!(capable->has_has_icedax&&strlen (prefs->cdplay_device))) {
+       lives_widget_set_sensitive (mainw->load_cdtrack, FALSE);
+       lives_widget_set_sensitive (mainw->eject_cd, FALSE);
      }
 @@ -2807,7 +2807,7 @@ void create_LiVES (void) {
    g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1695,8 +1695,8 @@ void do_start_messages(void) {
+@@ -1696,8 +1696,8 @@ void do_start_messages(void) {
    else d_print(_ ("composite...NOT DETECTED..."));
    if (capable->has_sox_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..."));
-@@ -1980,7 +1980,7 @@ capability *get_capabilities (void) {
+@@ -1981,7 +1981,7 @@ capability *get_capabilities (void) {
    capable->has_sox_play=FALSE;
    capable->has_sox_sox=FALSE;
    capable->has_dvgrab=FALSE;
@@ -88,7 +88,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    capable->has_autolives=FALSE;
    capable->has_jackd=FALSE;
    capable->has_gdb=FALSE;
-@@ -2140,8 +2140,8 @@ capability *get_capabilities (void) {
+@@ -2141,8 +2141,8 @@ capability *get_capabilities (void) {
    get_location("dvgrab",string,256);
    if (strlen(string)) capable->has_dvgrab=TRUE;
  
@@ -99,15 +99,15 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
    get_location("jackd",string,256);
    if (strlen(string)) capable->has_jackd=TRUE;
-@@ -3095,7 +3095,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);
--  if (capable->has_cdda2wav&&strlen (prefs->cdplay_device)) gtk_widget_set_sensitive (mainw->load_cdtrack, TRUE);
-+  if (capable->has_icedax&&strlen (prefs->cdplay_device)) gtk_widget_set_sensitive (mainw->load_cdtrack, TRUE);
-   gtk_widget_set_sensitive (mainw->rename, mainw->current_file>0&&!cfile->opening);
-   gtk_widget_set_sensitive (mainw->change_speed, mainw->current_file>0);
-   gtk_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
+@@ -3096,7 +3096,7 @@ void sensitize(void) {
+   lives_widget_set_sensitive (mainw->load_audio, TRUE);
+   lives_widget_set_sensitive (mainw->load_subs, mainw->current_file>0);
+   lives_widget_set_sensitive (mainw->erase_subs, mainw->current_file>0&&cfile->subt!=NULL);
+-  if (capable->has_cdda2wav&&strlen (prefs->cdplay_device)) lives_widget_set_sensitive (mainw->load_cdtrack, TRUE);
++  if (capable->has_icedax&&strlen (prefs->cdplay_device)) lives_widget_set_sensitive (mainw->load_cdtrack, TRUE);
+   lives_widget_set_sensitive (mainw->rename, mainw->current_file>0&&!cfile->opening);
+   lives_widget_set_sensitive (mainw->change_speed, mainw->current_file>0);
+   lives_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
 --- lives.orig/src/main.h
 +++ lives/src/main.h
 @@ -678,7 +678,7 @@ typedef struct {
@@ -132,19 +132,19 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
        set_pref("cdplay_device",prefs->cdplay_device);
 @@ -1823,7 +1823,7 @@ void on_prefDomainChanged(GtkTreeSelecti
        case LIST_ENTRY_MISC:
- 	gtk_widget_show_all(prefsw->scrollw_right_misc);
+ 	lives_widget_show_all(prefsw->scrollw_right_misc);
  	prefsw->right_shown = prefsw->scrollw_right_misc;
 -	if (!capable->has_cdda2wav) {
 +	if (!capable->has_icedax) {
- 	  gtk_widget_hide (prefsw->cdda_hbox);
+ 	  lives_widget_hide (prefsw->cdda_hbox);
  	}
  	break;
 @@ -3675,7 +3675,7 @@ _prefsw *create_prefs_dialog (void) {
-   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
+   lives_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
  
  
 -  if (!capable->has_cdda2wav) {
 +  if (!capable->has_icedax) {
-     gtk_widget_hide (prefsw->cdda_hbox);
+     lives_widget_hide (prefsw->cdda_hbox);
    }
     

-- 
lives packaging