access_samba: don't use deprecated functions.

[vlc] / modules / audio_filter / format.c

diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c
index f7b60ba8830b9434ae3de00dcf74911c2a62b400..0811231b104a31ce661f3fde102299723099b0e7 100644 (file)
--- a/modules/audio_filter/format.c
+++ b/modules/audio_filter/format.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_block.h>
@@ -117,7 +117,7 @@ static block_t *S8toU8( filter_t *, block_t * );
 static block_t *Swap16( filter_t *, block_t * );
 static block_t *Swap24( filter_t *, block_t * );
 
-static struct
+static const struct
 {
     vlc_fourcc_t i_src;
     vlc_fourcc_t i_dst;
@@ -201,13 +201,13 @@ static struct
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( _("Audio filter for PCM format conversion") );
-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_MISC );
-    set_capability( "audio filter2", 1 );
-    set_callbacks( Open, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Audio filter for PCM format conversion") )
+    set_category( CAT_AUDIO )
+    set_subcategory( SUBCAT_AUDIO_MISC )
+    set_capability( "audio filter2", 1 )
+    set_callbacks( Open, NULL )
+vlc_module_end ()
 
 /*****************************************************************************
  * Open:
@@ -229,11 +229,14 @@ static int Open( vlc_object_t *p_this )
     p_filter->pf_audio_filter = ConvertTable[i].pf_convert;
     p_filter->fmt_out.audio = p_filter->fmt_in.audio;
     p_filter->fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
+    p_filter->fmt_out.audio.i_bitspersample =
+        aout_BitsPerSample( p_filter->fmt_out.i_codec );
 
-    msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i",
+    msg_Dbg( p_this, "%4.4s->%4.4s, bits per sample: %i->%i",
              (char *)&p_filter->fmt_in.i_codec,
              (char *)&p_filter->fmt_out.i_codec,
-             p_filter->fmt_in.audio.i_bitspersample );
+             p_filter->fmt_in.audio.i_bitspersample,
+             p_filter->fmt_out.audio.i_bitspersample );
 
     return VLC_SUCCESS;
 }
@@ -355,7 +358,7 @@ static block_t *S24toFloat32( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -424,7 +427,7 @@ static block_t *S16toFloat32( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -457,7 +460,7 @@ static block_t *U16toFloat32( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -497,7 +500,7 @@ static block_t *S16toS24( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -632,7 +635,7 @@ static block_t *S8toU16( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -663,7 +666,7 @@ static block_t *U8toS16( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -695,7 +698,7 @@ static block_t *S8toS16( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -726,7 +729,7 @@ static block_t *U8toU16( filter_t *p_filter, block_t *p_block )
     p_block_out->i_length = p_block->i_length;
     p_block_out->i_rate = p_block->i_rate;
 
-    p_block->pf_release( p_block );
+    block_Release( p_block );
     return p_block_out;
 }
 
@@ -736,7 +739,7 @@ static block_t *U8toU16( filter_t *p_filter, block_t *p_block )
 static block_t *Swap16( filter_t *p_filter, block_t *p_block )
 {
     VLC_UNUSED(p_filter);
-    int i;
+    size_t i;
     uint8_t *p_in = (uint8_t *)p_block->p_buffer;
     uint8_t tmp;
 
@@ -754,7 +757,7 @@ static block_t *Swap16( filter_t *p_filter, block_t *p_block )
 static block_t *Swap24( filter_t *p_filter, block_t *p_block )
 {
     VLC_UNUSED(p_filter);
-    int i;
+    size_t i;
     uint8_t *p_in = (uint8_t *)p_block->p_buffer;
     uint8_t tmp;