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

[vlc] / modules / visualization / goom.c

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 658d6880118152b8d9a7068e96a7c0dcbe1d86a9..9382b80494bda39540c4ad08c996bd466fb3b8bf 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -31,7 +31,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
@@ -69,17 +70,17 @@ static void Close        ( vlc_object_t * );
 #define MAX_SPEED 10
 
 vlc_module_begin();
-    set_shortname( _("Goom"));
-    set_description( _("Goom effect") );
+    set_shortname( N_("Goom"));
+    set_description( N_("Goom effect") );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_VISUAL );
     set_capability( "visualization", 0 );
     add_integer( "goom-width", 320, NULL,
-                 WIDTH_TEXT, RES_LONGTEXT, VLC_FALSE );
+                 WIDTH_TEXT, RES_LONGTEXT, false );
     add_integer( "goom-height", 240, NULL,
-                 HEIGHT_TEXT, RES_LONGTEXT, VLC_FALSE );
+                 HEIGHT_TEXT, RES_LONGTEXT, false );
     add_integer( "goom-speed", 6, NULL,
-                 SPEED_TEXT, SPEED_LONGTEXT, VLC_FALSE );
+                 SPEED_TEXT, SPEED_LONGTEXT, false );
     set_callbacks( Open, Close );
     add_shortcut( "goom" );
 vlc_module_end();
@@ -181,7 +182,7 @@ static int Open( vlc_object_t *p_this )
         free( p_sys );
         return VLC_EGENERIC;
     }
-    vlc_mutex_init( p_filter, &p_thread->lock );
+    vlc_mutex_init( &p_thread->lock );
     vlc_cond_init( p_filter, &p_thread->wait );
 
     p_thread->i_blocks = 0;
@@ -192,10 +193,10 @@ static int Open( vlc_object_t *p_this )
     p_thread->psz_title = TitleGet( VLC_OBJECT( p_filter ) );
 
     if( vlc_thread_create( p_thread, "Goom Update Thread", Thread,
-                           VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+                           VLC_THREAD_PRIORITY_LOW, false ) )
     {
         msg_Err( p_filter, "cannot lauch goom thread" );
-        vout_Destroy( p_thread->p_vout );
+        vlc_object_release( p_thread->p_vout );
         vlc_mutex_destroy( &p_thread->lock );
         vlc_cond_destroy( &p_thread->wait );
         free( p_thread->psz_title );
@@ -216,6 +217,8 @@ static int Open( vlc_object_t *p_this )
 static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                     aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
 {
+    VLC_UNUSED( p_aout );
+
     aout_filter_sys_t *p_sys = p_filter->p_sys;
     block_t *p_block;