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

Never rename an object post attach & un-deprecated find_name

parent 9402e87f
...@@ -75,9 +75,6 @@ VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) ); ...@@ -75,9 +75,6 @@ VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
__attribute__((deprecated)) __attribute__((deprecated))
#endif #endif
VLC_EXPORT( void *, __vlc_object_find, ( vlc_object_t *, int, int ) ); VLC_EXPORT( void *, __vlc_object_find, ( vlc_object_t *, int, int ) );
#if defined (__GNUC__) && !defined __cplusplus
__attribute__((deprecated))
#endif
VLC_EXPORT( vlc_object_t *, vlc_object_find_name, ( vlc_object_t *, const char *, int ) ); VLC_EXPORT( vlc_object_t *, vlc_object_find_name, ( vlc_object_t *, const char *, int ) );
VLC_EXPORT( void *, __vlc_object_hold, ( vlc_object_t * ) ); 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 * ) );
......
...@@ -263,8 +263,6 @@ libvlc_int_t * libvlc_InternalCreate( void ) ...@@ -263,8 +263,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
priv->p_playlist = NULL; priv->p_playlist = NULL;
priv->p_dialog_provider = NULL; priv->p_dialog_provider = NULL;
priv->p_vlm = NULL; priv->p_vlm = NULL;
/* Avoid being called "memcpy":*/
vlc_internals(p_libvlc)->psz_object_name = strdup( "libvlc" );
/* Initialize message queue */ /* Initialize message queue */
msg_Create( p_libvlc ); msg_Create( p_libvlc );
......
...@@ -607,14 +607,6 @@ found_shortcut: ...@@ -607,14 +607,6 @@ found_shortcut:
{ {
msg_Dbg( p_this, "using %s module \"%s\"", msg_Dbg( p_this, "using %s module \"%s\"",
psz_capability, p_module->psz_object_name ); psz_capability, p_module->psz_object_name );
if( !vlc_internals(p_this)->psz_object_name )
{
/* This assumes that p_this is the object which will be using the
* module. That's not always the case ... but it is in most cases.
*/
vlc_internals(p_this)->psz_object_name =
strdup( psz_alias ? psz_alias : p_module->psz_object_name );
}
} }
else if( count == 0 ) else if( count == 0 )
{ {
......
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