[vlc-commits] Qt: inputChanged signal now takes the input_thread_t as parameter

[Jonathan Calmels]

vlc | branch: master | Jonathan Calmels <jbjcalmels at gmail.com> | Thu Jan 29 13:40:47 2015 +0100| [8d6cfafbc2d1d7bf07a082c7ef9d23d5c8dfd31a] | committer: Jean-Baptiste Kempf

Qt: inputChanged signal now takes the input_thread_t as parameter

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d6cfafbc2d1d7bf07a082c7ef9d23d5c8dfd31a
---

 modules/gui/qt4/components/interface_widgets.cpp       |    2 +-
 modules/gui/qt4/components/playlist/playlist_model.cpp |    2 +-
 modules/gui/qt4/extensions_manager.cpp                 |    2 +-
 modules/gui/qt4/input_manager.cpp                      |    8 ++++----
 modules/gui/qt4/input_manager.hpp                      |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 29c2ac3..8bef5bd 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -493,7 +493,7 @@ SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
     /* Change the SpeedRate in the Label */
     CONNECT( THEMIM->getIM(), rateChanged( float ), this, setRate( float ) );
 
-    DCONNECT( THEMIM, inputChanged( ),
+    DCONNECT( THEMIM, inputChanged( input_thread_t * ),
               speedControl, activateOnState() );
 
     setContentsMargins(4, 0, 4, 0);
diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 2bf217a..b5d68c4 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -59,7 +59,7 @@ PLModel::PLModel( playlist_t *_p_playlist,  /* THEPL */
     rebuild( p_root );
     DCONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
               this, processInputItemUpdate( input_item_t *) );
-    DCONNECT( THEMIM, inputChanged( ),
+    DCONNECT( THEMIM, inputChanged( input_thread_t * ),
               this, processInputItemUpdate( ) );
     CONNECT( THEMIM, playlistItemAppended( int, int ),
              this, processItemAppend( int, int ) );
diff --git a/modules/gui/qt4/extensions_manager.cpp b/modules/gui/qt4/extensions_manager.cpp
index ec2959d..e8af9b6 100644
--- a/modules/gui/qt4/extensions_manager.cpp
+++ b/modules/gui/qt4/extensions_manager.cpp
@@ -49,7 +49,7 @@ ExtensionsManager::ExtensionsManager( intf_thread_t *_p_intf, QObject *parent )
     menuMapper = new QSignalMapper( this );
     CONNECT( menuMapper, mapped( int ), this, triggerMenu( int ) );
     CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, playingChanged( int ) );
-    DCONNECT( THEMIM, inputChanged(  ),
+    DCONNECT( THEMIM, inputChanged( input_thread_t * ),
               this, inputChanged( ) );
     CONNECT( THEMIM->getIM(), metaChanged( input_item_t* ),
              this, metaChanged( input_item_t* ) );
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 8352885..bf6e5a5 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -1023,13 +1023,13 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
     mute.addCallback( this, SLOT(notifyMute(bool)) );
 
     /* Warn our embedded IM about input changes */
-    DCONNECT( this, inputChanged(),
+    DCONNECT( this, inputChanged( input_thread_t * ),
               im, inputChangedHandler() );
 
     /* initialize p_input (an input can already be running) */
     p_input = playlist_CurrentInput( THEPL );
     if( p_input )
-        emit inputChanged( );
+        emit inputChanged( p_input );
 
     /* Audio Menu */
     menusAudioMapper = new QSignalMapper();
@@ -1042,7 +1042,7 @@ MainInputManager::~MainInputManager()
     {
        vlc_object_release( p_input );
        p_input = NULL;
-       emit inputChanged( );
+       emit inputChanged( NULL );
     }
 
     var_DelCallback( THEPL, "activity", PLItemChanged, this );
@@ -1097,7 +1097,7 @@ void MainInputManager::customEvent( QEvent *event )
     if( p_input != NULL )
         vlc_object_release( p_input );
     p_input = playlist_CurrentInput( THEPL );
-    emit inputChanged( );
+    emit inputChanged( p_input );
 }
 
 /* Playlist Control functions */
diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index b69b6f9..97221a1 100644
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -314,7 +314,7 @@ private slots:
     void menusUpdateAudio( const QString& );
 
 signals:
-    void inputChanged( );
+    void inputChanged( input_thread_t * );
     void volumeChanged( float );
     void soundMuteChanged( bool );
     void playlistItemAppended( int itemId, int parentId );