]> git.sesse.net Git - vlc/commitdiff
qt4: metaChanged -> currentMetaChanged
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 16 May 2009 17:56:24 +0000 (20:56 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 16 May 2009 17:56:24 +0000 (20:56 +0300)
modules/gui/qt4/dialogs/mediainfo.cpp
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.hpp

index 41a5ef34050cd8250814f045e798cbebd65e2664..eb3f242c38a3dc7f409eacc3b1206222896a92b4 100644 (file)
@@ -103,9 +103,9 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf,
          **/
         CONNECT( THEMIM->getIM(), infoChanged( input_item_t* ),
                  IP, update( input_item_t* ) );
-        CONNECT( THEMIM->getIM(), metaChanged( input_item_t* ),
+        CONNECT( THEMIM->getIM(), currentMetaChanged( input_item_t* ),
                  MP, update( input_item_t* ) );
-        CONNECT( THEMIM->getIM(), metaChanged( input_item_t* ),
+        CONNECT( THEMIM->getIM(), currentMetaChanged( input_item_t* ),
                  EMP, update( input_item_t* ) );
         CONNECT( THEMIM->getIM(), statisticsUpdated( input_item_t* ),
                  ISP, update( input_item_t* ) );
index fcdb34a84f431fc76c0be3cb064f4023f54903b3..fd2381a4b9c82e901f2ce38ada85e1d3c7d7eb46 100644 (file)
@@ -137,7 +137,7 @@ void InputManager::delInput()
     /* Reset all InfoPanels but stats */
     emit artChanged( NULL );
     emit infoChanged( NULL );
-    emit metaChanged( (input_item_t *)NULL );
+    emit currentMetaChanged( (input_item_t *)NULL );
 
     emit encryptionChanged( false );
     emit recordingStateChanged( false );
@@ -612,7 +612,7 @@ inline void InputManager::UpdateMeta( int id )
 
 inline void InputManager::UpdateMeta()
 {
-    emit metaChanged( input_GetItem( p_input ) );
+    emit currentMetaChanged( input_GetItem( p_input ) );
 }
 
 inline void InputManager::UpdateInfo()
index 7433f15edc381ac6ef07259dd3ac296fec399690..98a1bbe36832f796aaac495b56251a1f93035a58 100644 (file)
@@ -185,7 +185,7 @@ signals:
     /// Statistics are updated
     void statisticsUpdated( input_item_t* );
     void infoChanged( input_item_t* );
-    void metaChanged( input_item_t* );
+    void currentMetaChanged( input_item_t* );
     void metaChanged( int );
     void artChanged( QString );
     /// Play/pause status