vlc_current_object: remove, vlc_object_get does the same thing

diff --git a/src/libvlc.c b/src/libvlc.c
index e8de65d90412d75b0824700990b10da5a307bcce..720dee937cc1e2071417f18e1f45f0394c3cb672 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -130,18 +130,6 @@ static int  VerboseCallback( vlc_object_t *, char const *,
 
 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
  * It also initializes the threading system

diff --git a/src/libvlc.h b/src/libvlc.h
index fd83455b3fb159cc50e6e0646137bb2cb6f2408b..1998ceec025accbfb3aadfcf140077c952a68d47 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -163,7 +163,6 @@ typedef struct libvlc_global_data_t
 
 
 libvlc_global_data_t *vlc_global (void);
-libvlc_int_t *vlc_current_object (int i_object);
 
 /**
  * Private LibVLC data for each object.

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 6485e6598812b10f7576712460673d4d1a013d3f..27a515f179ce0c6c992f9bf50d09130db5c3f1a6 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -505,7 +505,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
 
         /* Destination object-id is following object: */
         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 )
         {
             msg_Err( p_vout, "Cannot find calling object" );