[vlc-devel] commit: Qt: fix some issues about displaying the media information. ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec 31 13:27:35 2008 +0100| [0ed592d6ef1d6f15a6f9baec4cf64caff32fe1a1] | committer: Jean-Baptiste Kempf 

Qt: fix some issues about displaying the media information.

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

 modules/gui/qt4/components/info_panels.cpp |   19 ++++++++++++++++---
 modules/gui/qt4/dialogs/mediainfo.cpp      |    8 ++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index eb71bb6..e47e8a7 100644
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -158,7 +158,11 @@ MetaPanel::MetaPanel( QWidget *parent,
  **/
 void MetaPanel::update( input_item_t *p_item )
 {
-    if( !p_item ) clear();
+    if( !p_item )
+    {
+        clear();
+        return;
+    }
 
     /* Don't update if you are in edit mode */
     if( b_inEditMode ) return;
@@ -320,6 +324,7 @@ void MetaPanel::clear()
     art_cover->update( NULL );
 
     setEditMode( false );
+    emit uriSet( "" );
 }
 
 /**
@@ -354,7 +359,11 @@ ExtraMetaPanel::ExtraMetaPanel( QWidget *parent,
  **/
 void ExtraMetaPanel::update( input_item_t *p_item )
 {
-    if( !p_item ) clear();
+    if( !p_item )
+    {
+        clear();
+        return;
+    }
 
     QStringList tempItem;
     QList<QTreeWidgetItem *> items;
@@ -425,7 +434,11 @@ InfoPanel::InfoPanel( QWidget *parent,
  **/
 void InfoPanel::update( input_item_t *p_item)
 {
-    if( !p_item ) clear();
+    if( !p_item )
+    {
+        clear();
+        return;
+    }
 
     InfoTree->clear();
     QTreeWidgetItem *current_item = NULL;
diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index e908b87..5053b9d 100644
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -101,13 +101,13 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf,
          * Connects on the various signals of input_Manager
          * For the currently playing element
          **/
-        CONNECT( THEMIM, infoChanged( input_item_t* ),
+        CONNECT( THEMIM->getIM(), infoChanged( input_item_t* ),
                  IP, update( input_item_t* ) );
-        CONNECT( THEMIM, metaChanged( input_item_t* ),
+        CONNECT( THEMIM->getIM(), metaChanged( input_item_t* ),
                  MP, update( input_item_t* ) );
-        CONNECT( THEMIM, metaChanged( input_item_t* ),
+        CONNECT( THEMIM->getIM(), metaChanged( input_item_t* ),
                  EMP, update( input_item_t* ) );
-        CONNECT( THEMIM, statisticsUpdated( input_item_t* ),
+        CONNECT( THEMIM->getIM(), statisticsUpdated( input_item_t* ),
                  ISP, update( input_item_t* ) );
 
         if( THEMIM->getInput() )