From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 5 Sep 2009 07:59:47 +0000 (+0300)
Subject: Export vlc_object_get_name
X-Git-Tag: 1.1.0-ff~3526
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=940efdbdcff8e8d8768a6059d6bf1c2d86a32d33;p=vlc

Export vlc_object_get_name
---

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 804fc2010f..a5a692fc9b 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -83,6 +83,8 @@ VLC_EXPORT( void *, __vlc_object_hold, ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
 VLC_EXPORT( vlc_list_t *, __vlc_list_children, ( vlc_object_t * ) );
 VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
+VLC_EXPORT( const char *, vlc_object_get_name, ( const vlc_object_t * ) ) LIBVLC_USED;
+#define vlc_object_get_name(o) vlc_object_get_name(VLC_OBJECT(o))
 
 /*}@*/
 
diff --git a/src/libvlc.h b/src/libvlc.h
index 08890833aa..a5132526c3 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -198,11 +198,6 @@ typedef struct vlc_object_internals_t
 
 #define vlc_internals( obj ) (((vlc_object_internals_t*)(VLC_OBJECT(obj)))-1)
 
-static inline const char *vlc_object_get_name(const vlc_object_t *o)
-{
-    return vlc_internals(o)->psz_name;
-}
-
 typedef struct sap_handler_t sap_handler_t;
 
 /**
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 01cbbb4ca5..705ddd7f25 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -512,6 +512,7 @@ __vlc_object_hold
 __vlc_object_kill
 __vlc_object_release
 __vlc_object_set_destructor
+vlc_object_get_name
 vlc_plugin_set
 vlc_poll
 vlc_rand_bytes
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 63f3c2b315..cb7428743f 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -255,6 +255,14 @@ int vlc_object_set_name(vlc_object_t *obj, const char *name)
     return (priv->psz_name || !name) ? VLC_SUCCESS : VLC_ENOMEM;
 }
 
+#undef vlc_object_get_name
+const char *vlc_object_get_name(const vlc_object_t *obj)
+{
+    vlc_object_internals_t *priv = vlc_internals(obj);
+
+    return priv->psz_name;
+}
+
 /**
  ****************************************************************************
  * Destroy a vlc object (Internal)