[debian-edu-commits] debian-edu/pkg-team/ 02/02: Switch to PulseAudio back end on likely ALSA interception

[Javier Serrano Polo]

This is an automated email from the git hooks/post-receive script.

jasp00-guest pushed a commit to branch master
in repository lmms.

commit 9f4bc8f5b0235afcdb01466a76cc36a5e08004a1
Author: Javier Serrano Polo <javier at jasp.net>
Date:   Thu Apr 28 01:48:11 2016 +0200

    Switch to PulseAudio back end on likely ALSA interception
---
 debian/changelog                  |  1 +
 debian/patches/series             |  1 +
 debian/patches/switch-pulse.patch | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 412caec..6afedcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ lmms (1.1.3-1.1) unstable; urgency=low
   * Bumped Standards-Version to 3.9.7. Doxygen documentation is not very useful.
   * Use presets from zynaddsubfx-data.
   * Fixed build problems with GCC 6 (Closes: #811697).
+  * Switch to PulseAudio back end on likely ALSA interception (Closes: #781479).
 
  -- Javier Serrano Polo <javier at jasp.net>  Mon, 04 Apr 2016 19:42:09 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index f2b0edb..f03c8ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ wine-buildflags.patch
 gcc6.patch
 zynaddsubfx-libs.patch
 useless-deps.patch
+switch-pulse.patch
diff --git a/debian/patches/switch-pulse.patch b/debian/patches/switch-pulse.patch
new file mode 100644
index 0000000..b68338f
--- /dev/null
+++ b/debian/patches/switch-pulse.patch
@@ -0,0 +1,32 @@
+Description: Switch to PulseAudio back end on likely ALSA interception
+ If pulse.conf exists, it is likely that there will be an interception. The back
+ end next to ALSA is selected, which is PulseAudio.
+Author: Javier Serrano Polo <javier at jasp.net>
+
+Index: lmms-1.1.3/src/core/Mixer.cpp
+===================================================================
+--- lmms-1.1.3.orig/src/core/Mixer.cpp	2016-04-27 23:15:31.000000000 +0200
++++ lmms-1.1.3/src/core/Mixer.cpp	2016-04-27 23:47:47.000000000 +0200
+@@ -723,7 +723,21 @@
+ 	}
+ 
+ #ifdef LMMS_HAVE_ALSA
+-	if( dev_name == AudioAlsa::name() || dev_name == "" )
++	bool tryAlsa = true;
++
++#ifdef LMMS_HAVE_PULSEAUDIO
++	if ( AudioAlsa::probeDevice() == "default" &&
++		QFile( "/usr/share/alsa/alsa.conf.d/pulse.conf" ).exists())
++	{
++		tryAlsa = false;
++		if ( dev_name == AudioAlsa::name() )
++		{
++			dev_name = AudioPulseAudio::name();
++		}
++	}
++#endif
++
++	if( tryAlsa && ( dev_name == AudioAlsa::name() || dev_name == "" ) )
+ 	{
+ 		dev = new AudioAlsa( success_ful, this );
+ 		if( success_ful )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/lmms.git