[vlc-devel] commit: Use vlc_object_get_name() ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep  5 11:00:07 2009 +0300| [f612fe7e06ddf1cf8c779154497f62e4a3bcc988] | committer: Rémi Denis-Courmont 

Use vlc_object_get_name()

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

 modules/gui/ncurses.c                |    8 ++++----
 modules/gui/qt4/dialogs/messages.cpp |    7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 67afea8..b05f93d 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -1453,11 +1453,11 @@ static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt
 
 static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int i_level )
 {
-    /*if( p_obj->psz_object_name )
+    const char *psz_name = vlc_object_get_name( p_obj );
+    if( psz_name )
         MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%p)",
-                p_obj->psz_object_type, p_obj->psz_object_name,
-                p_obj );
-    else*/
+                p_obj->psz_object_type, psz_name, p_obj );
+    else
         MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%o)",
                 p_obj->psz_object_type, p_obj );
 
diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 06442e5..622cc2f 100644
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -278,11 +278,12 @@ void MessagesDialog::buildTree( QTreeWidgetItem *parentItem,
     else
         item = new QTreeWidgetItem( modulesTree );
 
-    /*if( p_obj->psz_object_name )
+    const char *name = vlc_object_get_name( p_obj );
+    if( name != NULL )
         item->setText( 0, qfu( p_obj->psz_object_type ) + " \"" +
-                       qfu( p_obj->psz_object_name ) + "\" (" +
+                       qfu( name ) + "\" (" +
                        QString::number((uintptr_t)p_obj) + ")" );
-    else*/
+    else
         item->setText( 0, qfu( p_obj->psz_object_type ) + " (" +
                        QString::number((uintptr_t)p_obj) + ")" );