[vlc-devel] commit: Revert "Avoid using vlc_object_find() when not needed" ( Rafaël Carré )

git version control git at videolan.org
Wed May 28 17:41:53 CEST 2008


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed May 28 17:41:51 2008 +0200| [0c9a964bf7b8face64b103ad99c1865f85d2bf29]

Revert "Avoid using vlc_object_find() when not needed"

This reverts commit ee6f60d7278f9d45835522eb60c247ee8bef77ac.
This case is already handled in vlc_object_find()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c9a964bf7b8face64b103ad99c1865f85d2bf29
---

 src/video_output/video_text.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index d5cebcc..bb77890 100644
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -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 );




More information about the vlc-devel mailing list