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

vlc_current_object: remove, vlc_object_get does the same thing

parent c45fbbdf
...@@ -130,18 +130,6 @@ static int VerboseCallback( vlc_object_t *, char const *, ...@@ -130,18 +130,6 @@ static int VerboseCallback( vlc_object_t *, char const *,
static void InitDeviceValues( libvlc_int_t * ); static void InitDeviceValues( libvlc_int_t * );
/*****************************************************************************
* vlc_current_object: return the current object.
*****************************************************************************
* If i_object is non-zero, return the corresponding object. Otherwise,
* return the statically allocated p_vlc object.
*****************************************************************************/
libvlc_int_t * vlc_current_object( int i_object )
{
return i_object ? vlc_object_get( i_object ) : p_static_vlc;
}
/** /**
* Allocate a libvlc instance, initialize global data if needed * Allocate a libvlc instance, initialize global data if needed
* It also initializes the threading system * It also initializes the threading system
......
...@@ -163,7 +163,6 @@ typedef struct libvlc_global_data_t ...@@ -163,7 +163,6 @@ typedef struct libvlc_global_data_t
libvlc_global_data_t *vlc_global (void); libvlc_global_data_t *vlc_global (void);
libvlc_int_t *vlc_current_object (int i_object);
/** /**
* Private LibVLC data for each object. * Private LibVLC data for each object.
......
...@@ -505,7 +505,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -505,7 +505,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
/* Destination object-id is following object: */ /* Destination object-id is following object: */
i_id = atoi( &val.psz_string[7] ); i_id = atoi( &val.psz_string[7] );
p_dest = ( vlc_object_t* )vlc_current_object( i_id ); p_dest = ( vlc_object_t* )vlc_object_get( i_id );
if( !p_dest ) if( !p_dest )
{ {
msg_Err( p_vout, "Cannot find calling object" ); msg_Err( p_vout, "Cannot find calling object" );
......
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