Replaced a certain amount of vlc_object_find by pl_Yield

[vlc] / modules / video_filter / atmo / atmo.cpp

diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index 38a6696849eac462f4a64720017bcdaf2acb640c..84b3cd94bcc4d0ff6ee4f5890e7c1089fad76291 100644 (file)
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -1926,18 +1926,13 @@ static int StateCallback( vlc_object_t *p_this, char const *psz_cmd,
 *****************************************************************************/
 static void AddStateVariableCallback(filter_t *p_filter)
 {
-    playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_filter,
-        VLC_OBJECT_PLAYLIST,
-        FIND_ANYWHERE );
-    if( p_playlist )
+    playlist_t *p_playlist = pl_Yield( p_filter );
+    input_thread_t *p_input = p_playlist->p_input;
+    if(p_input)
     {
-        input_thread_t *p_input = p_playlist->p_input;
-        if(p_input)
-        {
-            var_AddCallback( p_input, "state", StateCallback, p_filter );
-        }
-        vlc_object_release( p_playlist );
+        var_AddCallback( p_input, "state", StateCallback, p_filter );
     }
+    vlc_object_release( p_playlist );
 }
 
 /*****************************************************************************
@@ -1949,18 +1944,13 @@ static void AddStateVariableCallback(filter_t *p_filter)
 *****************************************************************************/
 static void DelStateVariableCallback( filter_t *p_filter )
 {
-    playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_filter,
-        VLC_OBJECT_PLAYLIST,
-        FIND_ANYWHERE );
-    if( p_playlist )
+    playlist_t *p_playlist = pl_Yield( p_filter );
+    input_thread_t *p_input = p_playlist->p_input;
+    if(p_input)
     {
-        input_thread_t *p_input = p_playlist->p_input;
-        if(p_input)
-        {
-            var_DelCallback( p_input, "state", StateCallback, p_filter );
-        }
-        vlc_object_release( p_playlist );
+        var_DelCallback( p_input, "state", StateCallback, p_filter );
     }
+    vlc_object_release( p_playlist );
 }