[SCM] vlc/master: Upstream patch to fix #801448

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Oct 27 17:42:39 UTC 2015


The following commit has been merged in the master branch:
commit 1fe9374ca47f6be7b8fe0322cfc3a01824e0750b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Oct 27 18:35:44 2015 +0100

    Upstream patch to fix #801448
    
    Closes: #801448

diff --git a/debian/patches/alsa-fix-changing-audio-device.patch b/debian/patches/alsa-fix-changing-audio-device.patch
new file mode 100644
index 0000000..9e519c8
--- /dev/null
+++ b/debian/patches/alsa-fix-changing-audio-device.patch
@@ -0,0 +1,22 @@
+Description: Qt: fix changing audio device
+Origin: upstream,
+ https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commit;h=994c11fb4c2d7c6af7b4e406d56fac72e95e7218
+Last-Update: 2015-10-27
+Bug-Debian: https://bugs.debian.org/801448
+
+diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
+index 15a14b9..998bc80 100644
+--- a/modules/gui/qt4/menus.cpp
++++ b/modules/gui/qt4/menus.cpp
+@@ -1583,7 +1583,7 @@ void VLCMenuBar::updateAudioDevice( intf_thread_t * p_intf, audio_output_t *p_ao
+             action->setChecked( true );
+         actionGroup->addAction( action );
+         current->addAction( action );
+-        CONNECT(action, changed(), THEMIM->menusAudioMapper, map());
++        CONNECT(action, triggered(), THEMIM->menusAudioMapper, map());
+         THEMIM->menusAudioMapper->setMapping(action, ids[i]);
+         free( ids[i] );
+         free( names[i] );
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 65b26f5..a176165 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 demux-mp4-correctly-match-release-function.patch
 unsubscribe-disable-motion.patch
+alsa-fix-changing-audio-device.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list