[vlc-devel] commit: Fix compilation (Christophe Mutricy )

[git version control]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Wed Jan  6 20:20:55 2010 +0000| [2c7bc975319786afc79cb585c956c38649a5f689] | committer: Christophe Mutricy 

Fix compilation

Fix 9a00da44cb60b01b142ae1a9a333833cf1fb0ab6

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

 modules/control/dbus.c                     |    6 +++++-
 modules/gui/qt4/components/info_panels.cpp |    7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index eeefed7..ed8f88c 100644
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -52,6 +52,7 @@
 #include <vlc_aout.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
+#include <vlc_meta.h>
 
 #include <math.h>
 
@@ -1192,7 +1193,10 @@ static int GetInputMeta( input_item_t* p_input,
 
     vlc_mutex_lock( &p_input->lock );
     if( p_input->p_meta )
-        ADD_META( 17, DBUS_TYPE_INT32, p_input->p_meta->i_status );
+    {
+        int i_status = vlc_meta_GetStatus( p_input->p_meta );
+        ADD_META( 17, DBUS_TYPE_INT32, i_status );
+    }
     vlc_mutex_unlock( &p_input->lock );
 
     ADD_VLC_META_STRING( 18, URI );
diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index a4f3364..76d176e 100644
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -33,6 +33,7 @@
 
 #include <assert.h>
 #include <vlc_url.h>
+#include <vlc_meta.h>
 
 #include <QTreeWidget>
 #include <QHeaderView>
@@ -362,13 +363,11 @@ void ExtraMetaPanel::update( input_item_t *p_item )
         return;
     }
 
-    vlc_dictionary_t * p_dict = &p_meta->extra_tags;
-    char ** ppsz_allkey = vlc_dictionary_all_keys( p_dict );
+    char ** ppsz_allkey = vlc_meta_CopyExtraNames( p_meta);
 
     for( int i = 0; ppsz_allkey[i] ; i++ )
     {
-        const char * psz_value = (const char *)vlc_dictionary_value_for_key(
-                p_dict, ppsz_allkey[i] );
+        const char * psz_value = vlc_meta_GetExtra( p_meta, ppsz_allkey[i] );
         QStringList tempItem;
         tempItem.append( qfu( ppsz_allkey[i] ) + " : ");
         tempItem.append( qfu( psz_value ) );