Commit 940efdbd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Export vlc_object_get_name

parent ba7f2c28
...@@ -83,6 +83,8 @@ VLC_EXPORT( void *, __vlc_object_hold, ( vlc_object_t * ) ); ...@@ -83,6 +83,8 @@ VLC_EXPORT( void *, __vlc_object_hold, ( vlc_object_t * ) );
VLC_EXPORT( void, __vlc_object_release, ( 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( vlc_list_t *, __vlc_list_children, ( vlc_object_t * ) );
VLC_EXPORT( void, vlc_list_release, ( vlc_list_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))
/*}@*/ /*}@*/
......
...@@ -198,11 +198,6 @@ typedef struct vlc_object_internals_t ...@@ -198,11 +198,6 @@ typedef struct vlc_object_internals_t
#define vlc_internals( obj ) (((vlc_object_internals_t*)(VLC_OBJECT(obj)))-1) #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; typedef struct sap_handler_t sap_handler_t;
/** /**
......
...@@ -512,6 +512,7 @@ __vlc_object_hold ...@@ -512,6 +512,7 @@ __vlc_object_hold
__vlc_object_kill __vlc_object_kill
__vlc_object_release __vlc_object_release
__vlc_object_set_destructor __vlc_object_set_destructor
vlc_object_get_name
vlc_plugin_set vlc_plugin_set
vlc_poll vlc_poll
vlc_rand_bytes vlc_rand_bytes
......
...@@ -255,6 +255,14 @@ int vlc_object_set_name(vlc_object_t *obj, const char *name) ...@@ -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; 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) * Destroy a vlc object (Internal)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment