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 730b7d8931fd1dee65ed8af8d47af4a45bb010ed..84b3cd94bcc4d0ff6ee4f5890e7c1089fad76291 100644 (file)
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -34,7 +34,8 @@
 
 // #define __ATMO_DEBUG__
 // [:Zs]+$
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include <vlc_playlist.h>
@@ -278,9 +279,9 @@ static const char *ppsz_channel_assignment_descriptions[] = {
 * Module descriptor
 *****************************************************************************/
 vlc_module_begin();
-set_description( _("AtmoLight Filter") );
+set_description( N_("AtmoLight Filter") );
 set_help( MODULE_DESCRIPTION );
-set_shortname( _( "AtmoLight" ));
+set_shortname( N_( "AtmoLight" ));
 set_capability( "video filter2", 0 );
 
 set_category( CAT_VIDEO );
@@ -468,9 +469,9 @@ set_callbacks( CreateFilter, DestroyFilter  );
 vlc_module_end();
 
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
 #if defined(WIN32)
-    "usebuildin",
+        "usebuildin",
 #endif
         "serialdev",
 
@@ -991,7 +992,7 @@ static void Atmo_SetupParameters(filter_t *p_filter)
     p_sys->i_atmo_height         = 48;
 
 
-    vlc_mutex_init( p_filter, &p_sys->filter_lock );
+    vlc_mutex_init( &p_sys->filter_lock );
 
 
 #if defined(WIN32)
@@ -1925,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 );
 }
 
 /*****************************************************************************
@@ -1948,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 );
 }