Allow aout to grab vout_Request calls.

[vlc] / modules / visualization / goom.c

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 418d1615651f99867782993695673c1813b5f38a..0fc8c1e88e7a951a332da6cf6d19d2d408cdf91d 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>
@@ -68,21 +69,21 @@ static void Close        ( vlc_object_t * );
 
 #define MAX_SPEED 10
 
-vlc_module_begin();
-    set_shortname( _("Goom"));
-    set_description( _("Goom effect") );
-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_VISUAL );
-    set_capability( "visualization", 0 );
+vlc_module_begin ()
+    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, false );
     add_integer( "goom-height", 240, NULL,
                  HEIGHT_TEXT, RES_LONGTEXT, false );
     add_integer( "goom-speed", 6, NULL,
                  SPEED_TEXT, SPEED_LONGTEXT, false );
-    set_callbacks( Open, Close );
-    add_shortcut( "goom" );
-vlc_module_end();
+    set_callbacks( Open, Close )
+    add_shortcut( "goom" )
+vlc_module_end ()
 
 /*****************************************************************************
  * Local prototypes
@@ -120,7 +121,7 @@ typedef struct aout_filter_sys_t
 static void DoWork   ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
                        aout_buffer_t * );
 
-static void Thread   ( vlc_object_t * );
+static void* Thread   ( vlc_object_t * );
 
 static char *TitleGet( vlc_object_t * );
 
@@ -172,7 +173,7 @@ static int Open( vlc_object_t *p_this )
     fmt.i_aspect = VOUT_ASPECT_FACTOR * width.i_int/height.i_int;
     fmt.i_sar_num = fmt.i_sar_den = 1;
 
-    p_thread->p_vout = vout_Request( p_filter, NULL, &fmt );
+    p_thread->p_vout = aout_filter_RequestVout( p_filter, NULL, &fmt );
     if( p_thread->p_vout == NULL )
     {
         msg_Err( p_filter, "no suitable vout module" );
@@ -181,8 +182,8 @@ static int Open( vlc_object_t *p_this )
         free( p_sys );
         return VLC_EGENERIC;
     }
-    vlc_mutex_init( p_filter, &p_thread->lock );
-    vlc_cond_init( p_filter, &p_thread->wait );
+    vlc_mutex_init( &p_thread->lock );
+    vlc_cond_init( &p_thread->wait );
 
     p_thread->i_blocks = 0;
     aout_DateInit( &p_thread->date, p_filter->output.i_rate );
@@ -195,7 +196,7 @@ static int Open( vlc_object_t *p_this )
                            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 );
@@ -233,7 +234,11 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     }
 
     p_block = block_New( p_sys->p_thread, p_in_buf->i_nb_bytes );
-    if( !p_block ) return;
+    if( !p_block )
+    {
+        vlc_mutex_unlock( &p_sys->p_thread->lock );
+        return;
+    }
     memcpy( p_block->p_buffer, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
     p_block->i_pts = p_in_buf->start_date;
 
@@ -316,7 +321,7 @@ static int FillBuffer( int16_t *p_data, int *pi_data,
 /*****************************************************************************
  * Thread:
  *****************************************************************************/
-static void Thread( vlc_object_t *p_this )
+static void* Thread( vlc_object_t *p_this )
 {
     goom_thread_t *p_thread = (goom_thread_t*)p_this;
     vlc_value_t width, height, speed;
@@ -324,6 +329,7 @@ static void Thread( vlc_object_t *p_this )
     int16_t p_data[2][512];
     int i_data = 0, i_count = 0;
     PluginInfo *p_plugin_info;
+    int canc = vlc_savecancel ();
 
     var_Get( p_this, "goom-width", &width );
     var_Get( p_this, "goom-height", &height );
@@ -335,7 +341,7 @@ static void Thread( vlc_object_t *p_this )
 
     p_plugin_info = goom_init( width.i_int, height.i_int );
 
-    while( !p_thread->b_die )
+    while( vlc_object_alive (p_thread) )
     {
         uint32_t  *plane;
         picture_t *p_pic;
@@ -360,7 +366,7 @@ static void Thread( vlc_object_t *p_this )
         p_thread->psz_title = NULL;
 
         while( !( p_pic = vout_CreatePicture( p_thread->p_vout, 0, 0, 0 ) ) &&
-               !p_thread->b_die )
+               vlc_object_alive (p_thread) )
         {
             msleep( VOUT_OUTMEM_SLEEP );
         }
@@ -368,12 +374,14 @@ static void Thread( vlc_object_t *p_this )
         if( p_pic == NULL ) break;
 
         memcpy( p_pic->p[0].p_pixels, plane, width.i_int * height.i_int * 4 );
-        vout_DatePicture( p_thread->p_vout, p_pic,
-                          aout_DateGet( &i_pts ) + GOOM_DELAY );
+
+        p_pic->date = aout_DateGet( &i_pts ) + GOOM_DELAY;
         vout_DisplayPicture( p_thread->p_vout, p_pic );
     }
 
     goom_close( p_plugin_info );
+    vlc_restorecancel (canc);
+    return NULL;
 }
 
 /*****************************************************************************
@@ -394,7 +402,7 @@ static void Close( vlc_object_t *p_this )
     vlc_thread_join( p_sys->p_thread );
 
     /* Free data */
-    vout_Request( p_filter, p_sys->p_thread->p_vout, 0 );
+    aout_filter_RequestVout( p_filter, p_sys->p_thread->p_vout, 0 );
     vlc_mutex_destroy( &p_sys->p_thread->lock );
     vlc_cond_destroy( &p_sys->p_thread->wait );
     vlc_object_detach( p_sys->p_thread );