i_nb_bytes -> i_buffer

[vlc] / modules / visualization / goom.c

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 08b1d6c0a65d2d5461a5cace957774b84fac1df4..2129cee9753307ccf775d1f70c5dbc8cba8d3d41 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -75,9 +75,9 @@ vlc_module_begin ()
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_VISUAL )
     set_capability( "visualization", 0 )
-    add_integer( "goom-width", 320, NULL,
+    add_integer( "goom-width", 800, NULL,
                  WIDTH_TEXT, RES_LONGTEXT, false )
-    add_integer( "goom-height", 240, NULL,
+    add_integer( "goom-height", 640, NULL,
                  HEIGHT_TEXT, RES_LONGTEXT, false )
     add_integer( "goom-speed", 6, NULL,
                  SPEED_TEXT, SPEED_LONGTEXT, false )
@@ -102,13 +102,13 @@ typedef struct
     vlc_cond_t    wait;
 
     /* Audio properties */
-    int i_channels;
+    unsigned i_channels;
 
     /* Audio samples queue */
     block_t       *pp_blocks[MAX_BLOCKS];
     int           i_blocks;
 
-    audio_date_t  date;
+    date_t        date;
 
 } goom_thread_t;
 
@@ -184,8 +184,8 @@ static int Open( vlc_object_t *p_this )
     vlc_cond_init( &p_thread->wait );
 
     p_thread->i_blocks = 0;
-    aout_DateInit( &p_thread->date, p_filter->output.i_rate );
-    aout_DateSet( &p_thread->date, 0 );
+    date_Init( &p_thread->date, p_filter->output.i_rate, 1 );
+    date_Set( &p_thread->date, 0 );
     p_thread->i_channels = aout_FormatNbChannels( &p_filter->input );
 
     p_thread->psz_title = TitleGet( VLC_OBJECT( p_filter ) );
@@ -221,7 +221,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     block_t *p_block;
 
     p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
-    p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes;
+    p_out_buf->i_buffer = p_in_buf->i_buffer;
 
     /* Queue sample */
     vlc_mutex_lock( &p_sys->p_thread->lock );
@@ -231,14 +231,14 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
         return;
     }
 
-    p_block = block_New( p_sys->p_thread, p_in_buf->i_nb_bytes );
+    p_block = block_New( p_sys->p_thread, p_in_buf->i_buffer );
     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;
+    memcpy( p_block->p_buffer, p_in_buf->p_buffer, p_in_buf->i_buffer );
+    p_block->i_pts = p_in_buf->i_pts;
 
     p_sys->p_thread->pp_blocks[p_sys->p_thread->i_blocks++] = p_block;
 
@@ -263,7 +263,7 @@ static inline int16_t FloatToInt16( float f )
  * Fill buffer
  *****************************************************************************/
 static int FillBuffer( int16_t *p_data, int *pi_data,
-                       audio_date_t *pi_date, audio_date_t *pi_date_end,
+                       date_t *pi_date, date_t *pi_date_end,
                        goom_thread_t *p_this )
 {
     int i_samples = 0;
@@ -274,18 +274,18 @@ static int FillBuffer( int16_t *p_data, int *pi_data,
         if( !p_this->i_blocks ) return VLC_EGENERIC;
 
         p_block = p_this->pp_blocks[0];
-        i_samples = __MIN( 512 - *pi_data, p_block->i_buffer /
-                           sizeof(float) / p_this->i_channels );
+        i_samples = __MIN( (unsigned)(512 - *pi_data),
+                p_block->i_buffer / sizeof(float) / p_this->i_channels );
 
         /* Date management */
         if( p_block->i_pts > 0 &&
-            p_block->i_pts != aout_DateGet( pi_date_end ) )
+            p_block->i_pts != date_Get( pi_date_end ) )
         {
-           aout_DateSet( pi_date_end, p_block->i_pts );
+           date_Set( pi_date_end, p_block->i_pts );
         }
         p_block->i_pts = 0;
 
-        aout_DateIncrement( pi_date_end, i_samples );
+        date_Increment( pi_date_end, i_samples );
 
         while( i_samples > 0 )
         {
@@ -323,7 +323,7 @@ static void* Thread( vlc_object_t *p_this )
 {
     goom_thread_t *p_thread = (goom_thread_t*)p_this;
     int width, height, speed;
-    audio_date_t i_pts;
+    date_t i_pts;
     int16_t p_data[2][512];
     int i_data = 0, i_count = 0;
     PluginInfo *p_plugin_info;
@@ -354,7 +354,7 @@ static void* Thread( vlc_object_t *p_this )
         if( speed && (++i_count % (speed+1)) ) continue;
 
         /* Frame dropping if necessary */
-        if( aout_DateGet( &i_pts ) + GOOM_DELAY <= mdate() ) continue;
+        if( date_Get( &i_pts ) + GOOM_DELAY <= mdate() ) continue;
 
         plane = goom_update( p_plugin_info, p_data, 0, 0.0,
                              p_thread->psz_title, NULL );
@@ -372,7 +372,7 @@ static void* Thread( vlc_object_t *p_this )
 
         memcpy( p_pic->p[0].p_pixels, plane, width * height * 4 );
 
-        p_pic->date = aout_DateGet( &i_pts ) + GOOM_DELAY;
+        p_pic->date = date_Get( &i_pts ) + GOOM_DELAY;
         vout_DisplayPicture( p_thread->p_vout, p_pic );
     }