Revert "Avoid using vlc_object_find() when not needed"
authorRafaël Carré <funman@videolan.org>
Wed, 28 May 2008 15:41:51 +0000 (17:41 +0200)
committerRafaël Carré <funman@videolan.org>
Wed, 28 May 2008 15:42:00 +0000 (17:42 +0200)
This reverts commit ee6f60d7278f9d45835522eb60c247ee8bef77ac.
This case is already handled in vlc_object_find()

src/video_output/video_text.c

index d5cebcc..bb77890 100644 (file)
@@ -131,14 +131,7 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
 
     if( !config_GetInt( p_caller, "osd" ) ) return;
 
-    if( p_caller->i_object_type == VLC_OBJECT_VOUT )
-    {
-        p_vout = (vout_thread_t*) p_caller;
-        vlc_object_yield( p_vout );
-    }
-    else
-        p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE );
-
+    p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE );
     if( p_vout )
     {
         va_start( args, psz_format );