vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Mar 17 17:23:54 2015 +0100| [1fbd0f24404187cc2d7454285f592ad23bf7a3de] | committer: Jean-Baptiste Kempf
Qt: MIM: code cosmetics > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1fbd0f24404187cc2d7454285f592ad23bf7a3de --- modules/gui/qt4/input_manager.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index 8d22701..0976e93 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -1014,17 +1014,23 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) { im = new InputManager( this, p_intf ); + /* Audio Menu */ + menusAudioMapper = new QSignalMapper(); + CONNECT( menusAudioMapper, mapped(QString), this, menusUpdateAudio( QString ) ); + + /* Core Callbacks */ var_AddCallback( THEPL, "item-change", ItemChanged, im ); var_AddCallback( THEPL, "activity", PLItemChanged, this ); var_AddCallback( THEPL, "leaf-to-parent", LeafToParent, this ); var_AddCallback( THEPL, "playlist-item-append", PLItemAppended, this ); var_AddCallback( THEPL, "playlist-item-deleted", PLItemRemoved, this ); + + /* Core Callbacks to widget */ random.addCallback( this, SLOT(notifyRandom(bool)) ); repeat.addCallback( this, SLOT(notifyRepeatLoop(bool)) ); - loop.addCallback( this, SLOT(notifyRepeatLoop(bool)) ); - + loop.addCallback( this, SLOT(notifyRepeatLoop(bool)) ); volume.addCallback( this, SLOT(notifyVolume(float)) ); - mute.addCallback( this, SLOT(notifyMute(bool)) ); + mute.addCallback( this, SLOT(notifyMute(bool)) ); /* Warn our embedded IM about input changes */ DCONNECT( this, inputChanged( input_thread_t * ), @@ -1034,10 +1040,6 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) p_input = playlist_CurrentInput( THEPL ); if( p_input ) emit inputChanged( p_input ); - - /* Audio Menu */ - menusAudioMapper = new QSignalMapper(); - CONNECT( menusAudioMapper, mapped(QString), this, menusUpdateAudio( QString ) ); } MainInputManager::~MainInputManager() _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
