[SCM] lives/master: Really set JACK as audio backend when Pulse is not available.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7c7cf2c8ba8e0537102cccc702b38888617c7d06
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jul 8 11:23:45 2012 +0200

    Really set JACK as audio backend when Pulse is not available.
    
    Closes: #664523

diff --git a/debian/patches/03-fix_startup_with_jack.patch b/debian/patches/03-fix_startup_with_jack.patch
new file mode 100644
index 0000000..963296a
--- /dev/null
+++ b/debian/patches/03-fix_startup_with_jack.patch
@@ -0,0 +1,17 @@
+Description: Set JACK as audio backend when Pulse is not available.
+From: http://lives.svn.sf.net/viewvc/lives/trunk/src/startup.c?r1=1446&r2=1509
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664523
+---
+ src/startup.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- lives.orig/src/startup.c
++++ lives/src/startup.c
+@@ -356,6 +356,7 @@ gboolean do_audio_choice_dialog(short st
+   radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton1));
+ 
+   if (prefs->audio_player==AUD_PLAYER_JACK||!capable->has_pulse_audio) {
++    prefs->audio_player=AUD_PLAYER_JACK;
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton1),TRUE);
+     set_pref("audio_player","jack");
+   }
diff --git a/debian/patches/series b/debian/patches/series
index 28e26b8..2081869 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
+03-fix_startup_with_jack.patch

-- 
lives packaging