s/vout_Destroy/vlc_object_release/ - A cat is a cat

[vlc] / modules / video_filter / logo.c

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 2de5dc89c52d22d4536c72c882ac36f9f5c170aa..6fcedca0213adf294ff7eb4e6eacf00a26d12590 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -30,7 +30,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include "vlc_filter.h"
@@ -94,15 +95,15 @@ static int LogoCallback( vlc_object_t *, char const *,
 
 #define CFG_PREFIX "logo-"
 
-static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_pos_descriptions[] =
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_pos_descriptions[] =
 { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
   N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
 vlc_module_begin();
-    set_description( _("Logo video filter") );
+    set_description( N_("Logo video filter") );
     set_capability( "video filter", 0 );
-    set_shortname( _("Logo overlay") );
+    set_shortname( N_("Logo overlay") );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_SUBPIC );
     add_shortcut( "logo" );
@@ -123,10 +124,10 @@ vlc_module_begin();
     add_submodule();
     set_capability( "sub filter", 0 );
     set_callbacks( CreateFilter, DestroyFilter );
-    set_description( _("Logo sub filter") );
+    set_description( N_("Logo sub filter") );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "file", "x", "y", "delay", "repeat", "transparency", "position", NULL
 };
 
@@ -488,12 +489,9 @@ static void End( vout_thread_t *p_vout )
     var_DelCallback( p_sys->p_vout, "mouse-x", MouseEvent, p_vout);
     var_DelCallback( p_sys->p_vout, "mouse-y", MouseEvent, p_vout);
 
-    if( p_sys->p_vout )
-    {
-        DEL_CALLBACKS( p_sys->p_vout, SendEvents );
-        vlc_object_detach( p_sys->p_vout );
-        vout_Destroy( p_sys->p_vout );
-    }
+    DEL_CALLBACKS( p_sys->p_vout, SendEvents );
+    vlc_object_detach( p_sys->p_vout );
+    vlc_object_release( p_sys->p_vout );
 
     if( p_sys->p_blend->p_module )
         module_Unneed( p_sys->p_blend, p_sys->p_blend->p_module );