[vlc-commits] Qt: fix changing audio device

Rémi Denis-Courmont git at videolan.org
Wed Oct 21 19:46:05 CEST 2015


vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Oct 21 20:42:58 2015 +0300| [994c11fb4c2d7c6af7b4e406d56fac72e95e7218] | committer: Jean-Baptiste Kempf

Qt: fix changing audio device

Change the audio device when the corresponding action is triggered, not
when it is modified... This completely broke ALSA playback.

(cherry picked from commit 7ac70075128318c51bbc1c0190482642f7a9226c)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=994c11fb4c2d7c6af7b4e406d56fac72e95e7218
---

 modules/gui/qt4/menus.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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] );



More information about the vlc-commits mailing list