vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jul 4 17:09:28 2012 +0300| [292bff196172d654953d1b5209e433147e37791e] | committer: Rémi Denis-Courmont
Qt4: fix prototype > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=292bff196172d654953d1b5209e433147e37791e --- modules/gui/qt4/input_manager.cpp | 4 ++-- modules/gui/qt4/input_manager.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index 2cda2c9..9dc5ac7 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -958,7 +958,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) repeat.addCallback( this, SLOT(notifyRepeatLoop(bool)) ); loop.addCallback( this, SLOT(notifyRepeatLoop(bool)) ); - volume.addCallback( this, SLOT(notifyVolume(int)) ); + volume.addCallback( this, SLOT(notifyVolume(int64_t)) ); mute.addCallback( this, SLOT(notifyMute(bool)) ); /* Warn our embedded IM about input changes */ @@ -1217,7 +1217,7 @@ static int LeafToParent( vlc_object_t *p_this, const char *psz_var, return VLC_SUCCESS; } -void MainInputManager::notifyVolume( int volume ) +void MainInputManager::notifyVolume( int64_t volume ) { emit volumeChanged( volume / (float)AOUT_VOLUME_DEFAULT ); } diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp index fbc99a8..ee41b4c 100644 --- a/modules/gui/qt4/input_manager.hpp +++ b/modules/gui/qt4/input_manager.hpp @@ -292,7 +292,7 @@ public slots: private slots: void notifyRandom( bool ); void notifyRepeatLoop( bool ); - void notifyVolume( int ); + void notifyVolume( int64_t ); void notifyMute( bool ); signals: void inputChanged( input_thread_t * ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
