[vlc-devel] commit: qt4: metaChanged -> currentMetaChanged ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sat May 16 20:05:59 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 16 20:56:24 2009 +0300| [d0b46b6781c63374cebc27e743b151b1581fb853] | committer: Rémi Denis-Courmont
qt4: metaChanged -> currentMetaChanged
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d0b46b6781c63374cebc27e743b151b1581fb853
---
modules/gui/qt4/dialogs/mediainfo.cpp | 4 ++--
modules/gui/qt4/input_manager.cpp | 4 ++--
modules/gui/qt4/input_manager.hpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index 41a5ef3..eb3f242 100644
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -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* ) );
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index fcdb34a..fd2381a 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -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()
diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 7433f15..98a1bbe 100644
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -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
More information about the vlc-devel
mailing list