Remove vlc_object_find_name() search mode parameter

include/vlc_objects.h

@@ -40,10 +40,6 @@
 /* Please do not add new object types anyway */
 #define VLC_OBJECT_GENERIC     (-666)
 
-/* Object search mode */
-#define FIND_CHILD          0x0002
-#define FIND_ANYWHERE       0x0003
-
 /* Object flags */
 #define OBJECT_FLAGS_NODBG       0x0001
 #define OBJECT_FLAGS_QUIET       0x0002
@@ -62,7 +58,7 @@ struct vlc_object_t
  * Prototypes
  *****************************************************************************/
 VLC_API void *vlc_object_create( vlc_object_t *, size_t ) VLC_MALLOC VLC_USED;
-VLC_API vlc_object_t *vlc_object_find_name( vlc_object_t *, const char *, int ) VLC_USED VLC_DEPRECATED;
+VLC_API vlc_object_t *vlc_object_find_name( vlc_object_t *, const char * ) VLC_USED VLC_DEPRECATED;
 VLC_API void * vlc_object_hold( vlc_object_t * );
 VLC_API void vlc_object_release( vlc_object_t * );
 VLC_API vlc_list_t *vlc_list_children( vlc_object_t * ) VLC_USED;
@@ -74,8 +70,8 @@ VLC_API char *vlc_object_get_name( const vlc_object_t * ) VLC_USED;
 
 #define vlc_object_create(a,b) vlc_object_create( VLC_OBJECT(a), b )
 
-#define vlc_object_find_name(a,b,c) \
-    vlc_object_find_name( VLC_OBJECT(a),b,c)
+#define vlc_object_find_name(a,b) \
+    vlc_object_find_name( VLC_OBJECT(a),b)
 
 #define vlc_object_hold(a) \
     vlc_object_hold( VLC_OBJECT(a) )

modules/control/motion.c

@@ -206,7 +206,7 @@ static void RunIntf( intf_thread_t *p_intf )
             {
                 /* TODO: cache object pointer */
                 vlc_object_t *p_obj =
-                vlc_object_find_name( p_intf->p_libvlc, "rotate", FIND_CHILD );
+                vlc_object_find_name( p_intf->p_libvlc, "rotate" );
                 if( p_obj )
                 {
                     var_SetInteger( p_obj, "rotate-deciangle",

modules/gui/macosx/controls.m

@@ -481,8 +481,7 @@
 - (IBAction)telxTransparent:(id)sender
 {
     vlc_object_t *p_vbi;
-    p_vbi = (vlc_object_t *) vlc_object_find_name( pl_Get( VLCIntf ),
-                    "zvbi", FIND_CHILD );
+    p_vbi = (vlc_object_t *) vlc_object_find_name( pl_Get( VLCIntf ), "zvbi" );
     if( p_vbi )
     {
         var_SetBool( p_vbi, "vbi-opaque", [sender state] );
@@ -509,8 +508,7 @@
         i_page = 'b' << 16;
     if( i_page == 0 ) return;
 
-    p_vbi = (vlc_object_t *) vlc_object_find_name( pl_Get( VLCIntf ),
-                "zvbi", FIND_CHILD );
+    p_vbi = (vlc_object_t *) vlc_object_find_name( pl_Get( VLCIntf ), "zvbi" );
     if( p_vbi )
     {
         var_SetInteger( p_vbi, "vbi-page", i_page );

modules/gui/macosx/extended.m

@@ -352,7 +352,7 @@ static VLCExtended *_o_sharedInstance = nil;
     else
     {
         msg_Dbg( p_intf, "we found a vout to adjust, let's look for the filter" );
-        p_filter = vlc_object_find_name( pl_Get(p_intf), "adjust", FIND_CHILD );
+        p_filter = vlc_object_find_name( pl_Get(p_intf), "adjust" );
 
         if(! p_filter )
         {

modules/gui/qt4/components/extended_panels.cpp

@@ -109,8 +109,7 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
     { \
         vlc_object_t *p_obj = ( vlc_object_t * ) \
             vlc_object_find_name( p_intf->p_libvlc, \
-                                  #widget, \
-                                  FIND_CHILD ); \
+                                  #widget ); \
         QCheckBox *checkbox = qobject_cast<QCheckBox*>( ui.widget##Enable ); \
         QGroupBox *groupbox = qobject_cast<QGroupBox*>( ui.widget##Enable ); \
         if( p_obj ) \
@@ -456,9 +455,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
     //std::cout << "Option name: " << option.toStdString() << std::endl;
 
     vlc_object_t *p_obj = ( vlc_object_t * )
-        vlc_object_find_name( p_intf->p_libvlc,
-                              qtu( module ),
-                              FIND_CHILD );
+        vlc_object_find_name( p_intf->p_libvlc, qtu( module ) );
     int i_type;
     vlc_value_t val;
 
@@ -549,9 +546,7 @@ void ExtVideo::updateFilterOptions()
     //std::cout << "Option name: " << option.toStdString() << std::endl;
 
     vlc_object_t *p_obj = ( vlc_object_t * )
-        vlc_object_find_name( p_intf->p_libvlc,
-                              qtu( module ),
-                              FIND_CHILD );
+        vlc_object_find_name( p_intf->p_libvlc, qtu( module ) );
     int i_type;
     bool b_is_command;
     if( !p_obj )
@@ -686,7 +681,7 @@ void ExtV4l2::showEvent( QShowEvent *event )
 
 void ExtV4l2::Refresh( void )
 {
-    vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2", FIND_CHILD );
+    vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2" );
     help->hide();
     if( box )
     {
@@ -830,7 +825,7 @@ void ExtV4l2::ValueChange( bool value )
 void ExtV4l2::ValueChange( int value )
 {
     QObject *s = sender();
-    vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2", FIND_CHILD );
+    vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2" );
     if( p_obj )
     {
         char *psz_var = strdup( qtu( s->objectName() ) );
@@ -1734,7 +1729,7 @@ void SyncControls::subsdelaySetFactor( double f_factor )
     config_PutFloat( p_intf, SUBSDELAY_CFG_FACTOR, f_factor );
 
     /* Try to find an instance of subsdelay, and set its factor */
-    vlc_object_t *p_obj = ( vlc_object_t * ) vlc_object_find_name( p_intf->p_libvlc, "subsdelay", FIND_CHILD );
+    vlc_object_t *p_obj = ( vlc_object_t * ) vlc_object_find_name( p_intf->p_libvlc, "subsdelay" );
     if( p_obj )
     {
         var_SetFloat( p_obj, SUBSDELAY_CFG_FACTOR, f_factor );

modules/gui/qt4/components/playlist/selector.cpp

@@ -474,8 +474,7 @@ void PLSelector::podcastAdd( PLSelItem * )
 
     setSource( podcastsParent ); //to load the SD in case it's not loaded
 
-    vlc_object_t *p_obj = (vlc_object_t*) vlc_object_find_name(
-        p_intf->p_libvlc, "podcast", FIND_CHILD );
+    vlc_object_t *p_obj = (vlc_object_t*) vlc_object_find_name( p_intf->p_libvlc, "podcast" );
     if( !p_obj ) return;
 
     QString request("ADD:");
@@ -498,7 +497,7 @@ void PLSelector::podcastRemove( PLSelItem* item )
     if( !input ) return;
 
     vlc_object_t *p_obj = (vlc_object_t*) vlc_object_find_name(
-        p_intf->p_libvlc, "podcast", FIND_CHILD );
+        p_intf->p_libvlc, "podcast" );
     if( !p_obj ) return;
 
     QString request("RM:");

modules/gui/qt4/dialogs/podcast_configuration.cpp

@@ -72,8 +72,7 @@ void PodcastConfigDialog::accept()
     }
     config_PutPsz( p_intf, "podcast-urls", qtu( urls ) );
     vlc_object_t *p_obj = (vlc_object_t*)
-                          vlc_object_find_name( p_intf->p_libvlc,
-                                                "podcast", FIND_CHILD );
+                          vlc_object_find_name( p_intf->p_libvlc, "podcast" );
     if( p_obj )
     {
         var_SetString( p_obj, "podcast-urls", qtu( urls ) );

src/control/video.c

@@ -609,7 +609,7 @@ static vlc_object_t *get_object( libvlc_media_player_t * p_mi,
 
     if( vout )
     {
-        object = vlc_object_find_name( vout, name, FIND_CHILD );
+        object = vlc_object_find_name( vout, name );
         vlc_object_release(vout);
     }
     else

src/misc/objects.c

@@ -85,7 +85,7 @@
 static int  DumpCommand( vlc_object_t *, char const *,
                          vlc_value_t, vlc_value_t, void * );
 
-static vlc_object_t * FindChildName ( vlc_object_internals_t *, const char * );
+static vlc_object_t * FindName ( vlc_object_internals_t *, const char * );
 static void PrintObject( vlc_object_internals_t *, const char * );
 static void DumpStructure( vlc_object_internals_t *, unsigned, char * );
 
@@ -426,35 +426,21 @@ static int objnamecmp(const vlc_object_t *obj, const char *name)
  *
  * @param p_this object to search from
  * @param psz_name name of the object to search for
- * @param i_mode search direction: FIND_PARENT, FIND_CHILD or FIND_ANYWHERE.
  *
  * @return a matching object (must be released by the caller),
  * or NULL on error.
  */
-vlc_object_t *vlc_object_find_name( vlc_object_t *p_this,
-                                    const char *psz_name, int i_mode )
+vlc_object_t *vlc_object_find_name( vlc_object_t *p_this, const char *psz_name )
 {
     vlc_object_t *p_found;
 
     /* Reading psz_object_name from a separate inhibits thread-safety.
      * Use a libvlc address variable instead for that sort of things! */
-    msg_Warn( p_this, "%s(%s) is not safe!", __func__, psz_name );
-    /* If have the requested name ourselves, don't look further */
-    if( !objnamecmp(p_this, psz_name) )
-    {
-        vlc_object_hold( p_this );
-        return p_this;
-    }
-
-    /* Otherwise, recursively look for the object */
-    if (i_mode == FIND_ANYWHERE)
-        return vlc_object_find_name (VLC_OBJECT(p_this->p_libvlc), psz_name,
-                                     FIND_CHILD);
+    msg_Err( p_this, "%s(\"%s\") is not safe!", __func__, psz_name );
 
-    assert (i_mode == FIND_CHILD);
     libvlc_lock (p_this->p_libvlc);
     vlc_mutex_lock (&name_lock);
-    p_found = FindChildName (vlc_internals (p_this), psz_name);
+    p_found = FindName (vlc_internals (p_this), psz_name);
     vlc_mutex_unlock (&name_lock);
     libvlc_unlock (p_this->p_libvlc);
     return p_found;
@@ -512,7 +498,7 @@ void vlc_object_release( vlc_object_t *p_this )
 
     if( b_should_destroy )
     {
-        /* Detach from parent to protect against FIND_CHILDREN */
+        /* Detach from parent to protect against vlc_object_find_name() */
         parent = p_this->p_parent;
         if (likely(parent))
         {
@@ -654,7 +640,7 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
     if( *newval.psz_string )
     {
         /* try using the object's name to find it */
-        p_object = vlc_object_find_name( p_data, newval.psz_string, FIND_CHILD );
+        p_object = vlc_object_find_name( p_data, newval.psz_string );
         if( !p_object )
             return VLC_ENOOBJ;
     }
@@ -713,15 +699,14 @@ void vlc_list_release( vlc_list_t *p_list )
 
 /* Following functions are local */
 
-static vlc_object_t *FindChildName (vlc_object_internals_t *priv,
-                                    const char *name)
+static vlc_object_t *FindName (vlc_object_internals_t *priv, const char *name)
 {
+    if (priv->psz_name != NULL && !strcmp (priv->psz_name, name))
+        return vlc_object_hold (vlc_externals (priv));
+
     for (priv = priv->first; priv != NULL; priv = priv->next)
     {
-        if (priv->psz_name && !strcmp (priv->psz_name, name))
-            return vlc_object_hold (vlc_externals (priv));
-
-        vlc_object_t *found = FindChildName (priv, name);
+        vlc_object_t *found = FindName (priv, name);
         if (found != NULL)
             return found;
     }

src/misc/variables.c

@@ -1373,7 +1373,7 @@ int var_Command( vlc_object_t *p_this, const char *psz_name,
                  const char *psz_cmd, const char *psz_arg, char **psz_msg )
 {
     vlc_object_t *p_obj = vlc_object_find_name( p_this->p_libvlc,
-                                                psz_name, FIND_CHILD );
+                                                psz_name );
     int i_type, i_ret;
 
     if( !p_obj )