[vlc-devel] commit: Export vlc_object_get_name ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sat Sep 5 10:15:37 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 5 10:59:47 2009 +0300| [940efdbdcff8e8d8768a6059d6bf1c2d86a32d33] | committer: Rémi Denis-Courmont
Export vlc_object_get_name
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=940efdbdcff8e8d8768a6059d6bf1c2d86a32d33
---
include/vlc_objects.h | 2 ++
src/libvlc.h | 5 -----
src/libvlccore.sym | 1 +
src/misc/objects.c | 8 ++++++++
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 804fc20..a5a692f 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 0889083..a513252 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 01cbbb4..705ddd7 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 63f3c2b..cb74287 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)
More information about the vlc-devel
mailing list