Commit 8e394d70 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* 2nd review of modules/audio* (refs #438)

parent 7629cf1b
/***************************************************************************** /*****************************************************************************
* dolby.c : simple decoder for dolby surround encoded streams * dolby.c : simple decoder for dolby surround encoded streams
***************************************************************************** *****************************************************************************
* Copyright (C) 2005 the VideoLAN team * Copyright (C) 2005, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Boris Dorès <babal@via.ecp.fr> * Authors: Boris Dorès <babal@via.ecp.fr>
...@@ -44,8 +44,8 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -44,8 +44,8 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( N_("Simple decoder for dolby surround encoded streams") ); set_description( N_("Simple decoder for Dolby Surround encoded streams") );
set_shortname( _("Dolby surround decoder") ); set_shortname( _("Dolby Surround decoder") );
set_category( CAT_INPUT ); set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC ); set_subcategory( SUBCAT_INPUT_ACODEC );
set_capability( "audio filter", 5 ); set_capability( "audio filter", 5 );
...@@ -105,7 +105,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -105,7 +105,7 @@ static int Create( vlc_object_t *p_this )
p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) ); p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
if ( p_filter->p_sys == NULL ) if ( p_filter->p_sys == NULL )
{ {
msg_Err( p_filter, "Out of memory" ); msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
p_filter->p_sys->i_left = -1; p_filter->p_sys->i_left = -1;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* headphone.c : headphone virtual spatialization channel mixer module * headphone.c : headphone virtual spatialization channel mixer module
* -> gives the feeling of a real room with a simple headphone * -> gives the feeling of a real room with a simple headphone
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2005 the VideoLAN team * Copyright (C) 2002-2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Boris Dorès <babal@via.ecp.fr> * Authors: Boris Dorès <babal@via.ecp.fr>
...@@ -60,8 +60,8 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -60,8 +60,8 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
#define HEADPHONE_COMPENSATE_TEXT N_("Compensate delay") #define HEADPHONE_COMPENSATE_TEXT N_("Compensate delay")
#define HEADPHONE_COMPENSATE_LONGTEXT N_( \ #define HEADPHONE_COMPENSATE_LONGTEXT N_( \
"The delay which is introduced by the physical algorithm may "\ "The delay which is introduced by the physical algorithm may "\
"sometimes be disturbing for the lipsync. In that case, turn "\ "sometimes be disturbing for the synchronization between lips-movement "\
"this on to compensate.") "and speech. In case, turn this on to compensate.")
#define HEADPHONE_DOLBY_TEXT N_("No decoding of Dolby Surround") #define HEADPHONE_DOLBY_TEXT N_("No decoding of Dolby Surround")
#define HEADPHONE_DOLBY_LONGTEXT N_( \ #define HEADPHONE_DOLBY_LONGTEXT N_( \
...@@ -344,7 +344,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -344,7 +344,7 @@ static int Create( vlc_object_t *p_this )
if ( p_filter->output.i_physical_channels if ( p_filter->output.i_physical_channels
!= (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT) ) != (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT) )
{ {
msg_Dbg( p_filter, "Filter discarded (incompatible format)" ); msg_Dbg( p_filter, "filter discarded (incompatible format)" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -380,7 +380,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -380,7 +380,7 @@ static int Create( vlc_object_t *p_this )
} }
if ( ! b_fit ) if ( ! b_fit )
{ {
msg_Dbg( p_filter, "Requesting specific format" ); msg_Dbg( p_filter, "requesting specific format" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -388,7 +388,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -388,7 +388,7 @@ static int Create( vlc_object_t *p_this )
p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) ); p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
if ( p_filter->p_sys == NULL ) if ( p_filter->p_sys == NULL )
{ {
msg_Err( p_filter, "Out of memory" ); msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
p_filter->p_sys->i_overflow_buffer_size = 0; p_filter->p_sys->i_overflow_buffer_size = 0;
...@@ -446,8 +446,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -446,8 +446,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
byte_t * p_overflow; byte_t * p_overflow;
byte_t * p_slide; byte_t * p_slide;
size_t i_overflow_size;/* in bytes */ size_t i_overflow_size; /* in bytes */
size_t i_out_size;/* in bytes */ size_t i_out_size; /* in bytes */
unsigned int i, j; unsigned int i, j;
......
/***************************************************************************** /*****************************************************************************
* simple.c : simple channel mixer plug-in (only 7/7.1/5/5.1 -> Stereo for now) * simple.c : simple channel mixer plug-in (only 7/7.1/5/5.1 -> Stereo for now)
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
...@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("audio filter for simple channel mixing") ); set_description( _("Audio filter for simple channel mixing") );
set_capability( "audio filter", 10 ); set_capability( "audio filter", 10 );
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
......
/***************************************************************************** /*****************************************************************************
* trivial.c : trivial channel mixer plug-in (drops unwanted channels) * trivial.c : trivial channel mixer plug-in (drops unwanted channels)
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
...@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("audio filter for trivial channel mixing") ); set_description( _("Audio filter for trivial channel mixing") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
......
/***************************************************************************** /*****************************************************************************
* a52tospdif.c : encapsulates A/52 frames into S/PDIF packets * a52tospdif.c : encapsulates A/52 frames into S/PDIF packets
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
...@@ -50,7 +50,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -50,7 +50,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for A/52->S/PDIF encapsulation") ); set_description( _("Audio filter for A/52->S/PDIF encapsulation") );
set_capability( "audio filter", 10 ); set_capability( "audio filter", 10 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
...@@ -82,8 +82,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -82,8 +82,8 @@ 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 ) aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{ {
/* AC3 is natively big endian. Most SPDIF devices have the native /* AC3 is natively big endian. Most SPDIF devices have the native
* endianness of the computersystem. * endianness of the computer system.
* On MAc OS X however, little endian devices are also common. * On Mac OS X however, little endian devices are also common.
*/ */
static const uint8_t p_sync_le[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x01, 0x00 }; static const uint8_t p_sync_le[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x01, 0x00 };
static const uint8_t p_sync_be[6] = { 0xF8, 0x72, 0x4E, 0x1F, 0x00, 0x01 }; static const uint8_t p_sync_be[6] = { 0xF8, 0x72, 0x4E, 0x1F, 0x00, 0x01 };
......
/***************************************************************************** /*****************************************************************************
* dtstofloat32.c: DTS Coherent Acoustics decoder plugin for VLC. * dtstofloat32.c: DTS Coherent Acoustics decoder plugin for VLC.
* This plugin makes use of libdts to do the actual decoding * This plugin makes use of libdca to do the actual decoding
* (http://www.videolan.org/dtsdec/). * (http://developers.videolan.org/libdca.html).
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team * Copyright (C) 2001, 2002libdca the VideoLAN team
* $Id$ * $Id$
* *
* Author: Gildas Bazin <gbazin@videolan.org> * Author: Gildas Bazin <gbazin@videolan.org>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <stdlib.h> /* malloc(), free() */ #include <stdlib.h> /* malloc(), free() */
#include <string.h> /* strdup() */ #include <string.h> /* strdup() */
#include <dts.h> /* libdts header file */ #include <dts.h> /* libdca header file */
#include <vlc/decoder.h> #include <vlc/decoder.h>
#include "aout_internal.h" #include "aout_internal.h"
...@@ -52,7 +52,7 @@ static int OpenFilter ( vlc_object_t * ); ...@@ -52,7 +52,7 @@ static int OpenFilter ( vlc_object_t * );
static void CloseFilter( vlc_object_t * ); static void CloseFilter( vlc_object_t * );
static block_t *Convert( filter_t *, block_t * ); static block_t *Convert( filter_t *, block_t * );
/* libdts channel order */ /* libdca channel order */
static const uint32_t pi_channels_in[] = static const uint32_t pi_channels_in[] =
{ AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, { AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_LFE, 0 }; AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_LFE, 0 };
...@@ -66,9 +66,9 @@ static const uint32_t pi_channels_out[] = ...@@ -66,9 +66,9 @@ static const uint32_t pi_channels_out[] =
*****************************************************************************/ *****************************************************************************/
struct filter_sys_t struct filter_sys_t
{ {
dts_state_t * p_libdts; /* libdts internal structure */ dts_state_t * p_libdts; /* libdca internal structure */
vlc_bool_t b_dynrng; /* see below */ vlc_bool_t b_dynrng; /* see below */
int i_flags; /* libdts flags, see dtsdec/doc/libdts.txt */ int i_flags; /* libdca flags, see dtsdec/doc/libdts.txt */
vlc_bool_t b_dontwarn; vlc_bool_t b_dontwarn;
int i_nb_channels; /* number of float32 per sample */ int i_nb_channels; /* number of float32 per sample */
...@@ -89,7 +89,7 @@ struct filter_sys_t ...@@ -89,7 +89,7 @@ struct filter_sys_t
vlc_module_begin(); vlc_module_begin();
set_category( CAT_INPUT ); set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC ); set_subcategory( SUBCAT_INPUT_ACODEC );
set_shortname( _("DTS" ) ); set_shortname( _("DCA" ) );
set_description( _("DTS Coherent Acoustics audio decoder") ); set_description( _("DTS Coherent Acoustics audio decoder") );
add_bool( "dts-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE ); add_bool( "dts-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
set_capability( "audio filter", 100 ); set_capability( "audio filter", 100 );
...@@ -215,11 +215,11 @@ static int Open( vlc_object_t *p_this, filter_sys_t *p_sys, ...@@ -215,11 +215,11 @@ static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
} }
//p_sys->i_flags |= DTS_ADJUST_LEVEL; //p_sys->i_flags |= DTS_ADJUST_LEVEL;
/* Initialize libdts */ /* Initialize libdca */
p_sys->p_libdts = dts_init( 0 ); p_sys->p_libdts = dts_init( 0 );
if( p_sys->p_libdts == NULL ) if( p_sys->p_libdts == NULL )
{ {
msg_Err( p_this, "unable to initialize libdts" ); msg_Err( p_this, "unable to initialize libdca" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -303,7 +303,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -303,7 +303,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
if( !dts_syncinfo( p_sys->p_libdts, p_in_buf->p_buffer, &i_flags, if( !dts_syncinfo( p_sys->p_libdts, p_in_buf->p_buffer, &i_flags,
&i_sample_rate, &i_bit_rate, &i_frame_length ) ) &i_sample_rate, &i_bit_rate, &i_frame_length ) )
{ {
msg_Warn( p_aout, "libdts couldn't sync on frame" ); msg_Warn( p_aout, "libdca couldn't sync on frame" );
p_out_buf->i_nb_samples = p_out_buf->i_nb_bytes = 0; p_out_buf->i_nb_samples = p_out_buf->i_nb_bytes = 0;
return; return;
} }
...@@ -316,7 +316,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -316,7 +316,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
&& !p_sys->b_dontwarn ) && !p_sys->b_dontwarn )
{ {
msg_Warn( p_aout, msg_Warn( p_aout,
"libdts couldn't do the requested downmix 0x%x->0x%x", "libdca couldn't do the requested downmix 0x%x->0x%x",
p_sys->i_flags & DTS_CHANNEL_MASK, p_sys->i_flags & DTS_CHANNEL_MASK,
i_flags & DTS_CHANNEL_MASK ); i_flags & DTS_CHANNEL_MASK );
......
/***************************************************************************** /*****************************************************************************
* dtstospdif.c : encapsulates DTS frames into S/PDIF packets * dtstospdif.c : encapsulates DTS frames into S/PDIF packets
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 the VideoLAN team * Copyright (C) 2003, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -67,7 +67,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -67,7 +67,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for DTS->S/PDIF encapsulation") ); set_description( _("Audio filter for DTS->S/PDIF encapsulation") );
set_capability( "audio filter", 10 ); set_capability( "audio filter", 10 );
set_callbacks( Create, Close ); set_callbacks( Create, Close );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* fixed32float32.c : converter from fixed32 to float32 bits integer * fixed32float32.c: converter from fixed32 to float32 bits integer
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org> * Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
...@@ -47,7 +47,7 @@ static void FloatToFixed ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -47,7 +47,7 @@ static void FloatToFixed ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for fixed32<->float32 conversion") ); set_description( _("Audio filter for fixed32<->float32 conversion") );
set_capability( "audio filter", 10 ); set_capability( "audio filter", 10 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* fixed32tos16.c : converter from fixed32 to signed 16 bits integer * fixed32tos16.c : converter from fixed32 to signed 16 bits integer
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org> * Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for fixed32->s16 conversion") ); set_description( _("Audio filter for fixed32->s16 conversion") );
set_capability( "audio filter", 10 ); set_capability( "audio filter", 10 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* float32tos16.c : converter from float32 to signed 16 bits integer * float32tos16.c : converter from float32 to signed 16 bits integer
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for float32->s16 conversion") ); set_description( _("Audio filter for float32->s16 conversion") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* float32tos8.c : converter from float32 to signed 8 bits integer * float32tos8.c : converter from float32 to signed 8 bits integer
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Xavier Maillard <zedek@fxgsproject.org> * Authors: Xavier Maillard <zedek@fxgsproject.org>
...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for float32->s8 conversion") ); set_description( _("Audio filter for float32->s8 conversion") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* float32tou16.c : converter from float32 to unsigned 16 bits integer * float32tou16.c : converter from float32 to unsigned 16 bits integer
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Xavier Maillard <zedek@fxgsproject.org> * Authors: Xavier Maillard <zedek@fxgsproject.org>
...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for float32->u16 conversion") ); set_description( _("Audio filter for float32->u16 conversion") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* float32tou8.c : converter from float32 to unsigned 8 bits integer * float32tou8.c : converter from float32 to unsigned 8 bits integer
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Xavier Maillard <zedek@fxgsproject.org> * Authors: Xavier Maillard <zedek@fxgsproject.org>
...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for float32->u8 conversion") ); set_description( _("Audio filter for float32->u8 conversion") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* s16tofixed32.c : converter from signed 16 bits integer to fixed 32 * s16tofixed32.c : converter from signed 16 bits integer to fixed 32
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Marc Ariberti <marcari@videolan.ord> * Authors: Marc Ariberti <marcari@videolan.ord>
...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for s16->fixed32 conversion") ); set_description( _("Audio filter for s16->fixed32 conversion") );
set_capability( "audio filter", 15 ); set_capability( "audio filter", 15 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* s16tofloat32.c : converter from signed 16 bits integer to float32 * s16tofloat32.c : converter from signed 16 bits integer to float32
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2005 the VideoLAN team * Copyright (C) 2002-2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
...@@ -47,7 +47,7 @@ static void DoWork24 ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -47,7 +47,7 @@ static void DoWork24 ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for s16->float32 conversion") ); set_description( _("Audio filter for s16->float32 conversion") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* s16tofloat32swab.c : converter from signed 16 bits integer to float32 * s16tofloat32swab.c : converter from signed 16 bits integer to float32
* with endianness change * with endianness change
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2005 the VideoLAN team * Copyright (C) 2002-2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
...@@ -59,7 +59,7 @@ vlc_module_begin(); ...@@ -59,7 +59,7 @@ vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( set_description(
_("audio filter for s16->float32 with endianness conversion") ); _("Audio filter for s16->float32 with endianness conversion") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* s8tofloat32.c : converter from signed 8 bits integer to float32. * s8tofloat32.c : converter from signed 8 bits integer to float32.
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for s8->float32 conversion") ); set_description( _("Audio filter for s8->float32 conversion") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* u8tofixed32.c : converter from unsigned 8 bits integer to fixed32. * u8tofixed32.c : converter from unsigned 8 bits integer to fixed32.
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for u8->fixed32 conversion") ); set_description( _("Audio filter for u8->fixed32 conversion") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* u8tofloat32.c : converter from unsigned 8 bits integer to float32. * u8tofloat32.c : converter from unsigned 8 bits integer to float32.
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for u8->float32 conversion") ); set_description( _("Audio filter for u8->float32 conversion") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_callbacks( Create, NULL ); set_callbacks( Create, NULL );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* equalizer.c: * equalizer.c:
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 the VideoLAN team * Copyright (C) 2004, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
...@@ -54,19 +54,19 @@ static void Close( vlc_object_t * ); ...@@ -54,19 +54,19 @@ static void Close( vlc_object_t * );
#define BANDS_TEXT N_( "Bands gain") #define BANDS_TEXT N_( "Bands gain")
#define BANDS_LONGTEXT N_( \ #define BANDS_LONGTEXT N_( \
"Don't use presets, manually specify bands. You need to provide " \ "Don't use presets, but manually specified bands. You need to " \
"10 values between -20dB and 20dB, separated by spaces, like " \ "provide 10 values between -20dB and 20dB, separated by spaces, " \
"\"0 2 4 2 0 -2 -4 -2 0\"" ) "e.g. \"0 2 4 2 0 -2 -4 -2 0\"" )
#define TWOPASS_TEXT N_( "Two pass" ) #define TWOPASS_TEXT N_( "Two pass" )
#define TWOPASS_LONGTEXT N_( "Filter twice the audio. This provides a more" \ #define TWOPASS_LONGTEXT N_( "Filter the audio twice. This provides a more " \
"intense effect.") "intense effect.")
#define PREAMP_TEXT N_("Global gain" ) #define PREAMP_TEXT N_("Global gain" )
#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)." ) #define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)." )
vlc_module_begin(); vlc_module_begin();
set_description( _("Equalizer 10 bands") ); set_description( _("Equalizer with 10 bands") );
set_shortname( N_("Equalizer" ) ); set_shortname( N_("Equalizer" ) );
set_capability( "audio filter", 0 ); set_capability( "audio filter", 0 );
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
...@@ -148,7 +148,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -148,7 +148,7 @@ static int Open( vlc_object_t *p_this )
b_fit = VLC_FALSE; b_fit = VLC_FALSE;
p_filter->input.i_format = VLC_FOURCC('f','l','3','2'); p_filter->input.i_format = VLC_FOURCC('f','l','3','2');
p_filter->output.i_format = VLC_FOURCC('f','l','3','2'); p_filter->output.i_format = VLC_FOURCC('f','l','3','2');
msg_Warn( p_filter, "Bad input or output format" ); msg_Warn( p_filter, "bad input or output format" );
} }
if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
{ {
...@@ -291,7 +291,7 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate ) ...@@ -291,7 +291,7 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate )
else else
{ {
/* TODO compute the coeffs on the fly */ /* TODO compute the coeffs on the fly */
msg_Err( p_filter, "unsupported rate" ); msg_Err( p_filter, "rate not supported" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -198,7 +198,7 @@ static struct ...@@ -198,7 +198,7 @@ static struct
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("audio filter for PCM format conversion") ); set_description( _("Audio filter for PCM format conversion") );
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_capability( "audio filter2", 1 ); set_capability( "audio filter2", 1 );
......
/***************************************************************************** /*****************************************************************************
* normvol.c : volume normalizer * normvol.c: volume normalizer
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 the VideoLAN team * Copyright (C) 2001, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Clément Stenac <zorglub@videolan.org> * Authors: Clément Stenac <zorglub@videolan.org>
...@@ -109,7 +109,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -109,7 +109,7 @@ static int Open( vlc_object_t *p_this )
b_fit = VLC_FALSE; b_fit = VLC_FALSE;
p_filter->input.i_format = VLC_FOURCC('f','l','3','2'); p_filter->input.i_format = VLC_FOURCC('f','l','3','2');
p_filter->output.i_format = VLC_FOURCC('f','l','3','2'); p_filter->output.i_format = VLC_FOURCC('f','l','3','2');
msg_Warn( p_filter, "Bad input or output format" ); msg_Warn( p_filter, "bad input or output format" );
} }
if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
......
...@@ -114,7 +114,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -114,7 +114,7 @@ static int Open( vlc_object_t *p_this )
b_fit = VLC_FALSE; b_fit = VLC_FALSE;
p_filter->input.i_format = VLC_FOURCC('f','l','3','2'); p_filter->input.i_format = VLC_FOURCC('f','l','3','2');
p_filter->output.i_format = VLC_FOURCC('f','l','3','2'); p_filter->output.i_format = VLC_FOURCC('f','l','3','2');
msg_Warn( p_filter, "Bad input or output format" ); msg_Warn( p_filter, "bad input or output format" );
} }
if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) ) if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
{ {
......
/***************************************************************************** /*****************************************************************************
* bandlimited.c : band-limited interpolation resampler * bandlimited.c : band-limited interpolation resampler
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
...@@ -81,7 +81,7 @@ struct aout_filter_sys_t ...@@ -81,7 +81,7 @@ struct aout_filter_sys_t
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_description( _("audio filter for band-limited interpolation resampling") ); set_description( _("Audio filter for band-limited interpolation resampling") );
set_capability( "audio filter", 20 ); set_capability( "audio filter", 20 );
set_callbacks( Create, Close ); set_callbacks( Create, Close );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* linear.c : linear interpolation resampler * linear.c : linear interpolation resampler
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
...@@ -62,14 +62,14 @@ struct filter_sys_t ...@@ -62,14 +62,14 @@ struct filter_sys_t
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("audio filter for linear interpolation resampling") ); set_description( _("Audio filter for linear interpolation resampling") );
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
set_capability( "audio filter", 5 ); set_capability( "audio filter", 5 );
set_callbacks( Create, Close ); set_callbacks( Create, Close );
add_submodule(); add_submodule();
set_description( _("audio filter for linear interpolation resampling") ); set_description( _("Audio filter for linear interpolation resampling") );
set_capability( "audio filter2", 5 ); set_capability( "audio filter2", 5 );
set_callbacks( OpenFilter, CloseFilter ); set_callbacks( OpenFilter, CloseFilter );
vlc_module_end(); vlc_module_end();
......
/***************************************************************************** /*****************************************************************************
* trivial.c : trivial resampler (skips samples or pads with zeroes) * trivial.c : trivial resampler (skips samples or pads with zeroes)
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
...@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("audio filter for trivial resampling") ); set_description( _("Audio filter for trivial resampling") );
set_capability( "audio filter", 1 ); set_capability( "audio filter", 1 );
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
......
/***************************************************************************** /*****************************************************************************
* ugly.c : ugly resampler (changes pitch) * ugly.c : ugly resampler (changes pitch)
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
...@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("audio filter for ugly resampling") ); set_description( _("Audio filter for ugly resampling") );
set_capability( "audio filter", 2 ); set_capability( "audio filter", 2 );
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_AUDIO_MISC );
......
...@@ -201,7 +201,7 @@ static void Probe( aout_instance_t * p_aout, ...@@ -201,7 +201,7 @@ static void Probe( aout_instance_t * p_aout,
break; break;
case 6: case 6:
val.i_int = AOUT_VAR_5_1; val.i_int = AOUT_VAR_5_1;
text.psz_string = N_("5.1"); text.psz_string = "5.1";
var_Change( p_aout, "audio-device", var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text ); VLC_VAR_ADDCHOICE, &val, &text );
break; break;
...@@ -566,9 +566,9 @@ static int Open( vlc_object_t *p_this ) ...@@ -566,9 +566,9 @@ static int Open( vlc_object_t *p_this )
#endif #endif
if( i_snd_rc < 0 || p_aout->output.output.i_rate != i_old_rate ) if( i_snd_rc < 0 || p_aout->output.output.i_rate != i_old_rate )
{ {
msg_Warn( p_aout, "The rate %d Hz is not supported by your hardware. " msg_Warn( p_aout, "The rate %d Hz is not supported by your " \
"Using %d Hz instead.\n", i_old_rate, "hardware. Using %d Hz instead.\n", i_old_rate, \
p_aout->output.output.i_rate ); p_aout->output.output.i_rate );
} }
/* Set buffer size. */ /* Set buffer size. */
......
...@@ -415,7 +415,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -415,7 +415,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARCENTER; p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARCENTER;
continue; continue;
default: default:
msg_Warn( p_aout, "Unrecognized channel form provided by driver: %d", (int)layout->mChannelDescriptions[i].mChannelLabel ); msg_Warn( p_aout, "unrecognized channel form provided by driver: %d", (int)layout->mChannelDescriptions[i].mChannelLabel );
} }
} }
if( p_aout->output.output.i_physical_channels == 0 ) if( p_aout->output.output.i_physical_channels == 0 )
...@@ -637,7 +637,7 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -637,7 +637,7 @@ static int OpenSPDIF( aout_instance_t * p_aout )
p_streams = (AudioStreamID *)malloc( i_param_size ); p_streams = (AudioStreamID *)malloc( i_param_size );
if( p_streams == NULL ) if( p_streams == NULL )
{ {
msg_Err( p_aout, "Out of memory" ); msg_Err( p_aout, "out of memory" );
return VLC_FALSE; return VLC_FALSE;
} }
...@@ -1012,7 +1012,7 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -1012,7 +1012,7 @@ static void Probe( aout_instance_t * p_aout )
var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
if( p_sys->i_default_dev == p_devices[i] && config_GetInt( p_aout, "spdif" ) ) if( p_sys->i_default_dev == p_devices[i] && config_GetInt( p_aout, "spdif" ) )
{ {
/* I we selected to prefer SPDIF output if available /* We selected to prefer SPDIF output if available
* then this "dummy" entry should be selected */ * then this "dummy" entry should be selected */
var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL );
var_Set( p_aout, "audio-device", val ); var_Set( p_aout, "audio-device", val );
...@@ -1088,7 +1088,7 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_ ...@@ -1088,7 +1088,7 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_
p_streams = (AudioStreamID *)malloc( i_param_size ); p_streams = (AudioStreamID *)malloc( i_param_size );
if( p_streams == NULL ) if( p_streams == NULL )
{ {
msg_Err( p_aout, "Out of memory" ); msg_Err( p_aout, "out of memory" );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
......
...@@ -412,7 +412,7 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -412,7 +412,7 @@ static void Probe( aout_instance_t * p_aout )
== VLC_SUCCESS ) == VLC_SUCCESS )
{ {
val.i_int = AOUT_VAR_5_1; val.i_int = AOUT_VAR_5_1;
text.psz_string = N_("5.1"); text.psz_string = "5.1";
var_Change( p_aout, "audio-device", var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text ); VLC_VAR_ADDCHOICE, &val, &text );
msg_Dbg( p_aout, "device supports 5.1 channels" ); msg_Dbg( p_aout, "device supports 5.1 channels" );
...@@ -582,7 +582,7 @@ static void CloseAudio( vlc_object_t *p_this ) ...@@ -582,7 +582,7 @@ static void CloseAudio( vlc_object_t *p_this )
aout_instance_t * p_aout = (aout_instance_t *)p_this; aout_instance_t * p_aout = (aout_instance_t *)p_this;
aout_sys_t *p_sys = p_aout->output.p_sys; aout_sys_t *p_sys = p_aout->output.p_sys;
msg_Dbg( p_aout, "CloseAudio" ); msg_Dbg( p_aout, "closing audio device" );
/* kill the position notification thread, if any */ /* kill the position notification thread, if any */
if( p_sys->p_notif ) if( p_sys->p_notif )
......
...@@ -82,13 +82,13 @@ static void Play ( aout_instance_t * ); ...@@ -82,13 +82,13 @@ static void Play ( aout_instance_t * );
#define FORMAT_LONGTEXT N_("One of \"u8\", \"s8\", \"u16\", \"s16\", " \ #define FORMAT_LONGTEXT N_("One of \"u8\", \"s8\", \"u16\", \"s16\", " \
"\"u16_le\", \"s16_le\", \"u16_be\", \"s16_be\", \"fixed32\", " \ "\"u16_le\", \"s16_le\", \"u16_be\", \"s16_be\", \"fixed32\", " \
"\"float32\" or \"spdif\"") "\"float32\" or \"spdif\"")
#define CHANNELS_TEXT N_("Output channels number") #define CHANNELS_TEXT N_("Number of output channels")
#define CHANNELS_LONGTEXT N_("By default, all the channels of the incoming " \ #define CHANNELS_LONGTEXT N_("By default, all the channels of the incoming " \
"will be saved but you can restrict the number of channels here.") "will be saved but you can restrict the number of channels here.")
#define WAV_TEXT N_("Add wave header") #define WAV_TEXT N_("Add WAVE header")
#define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a WAV " \ #define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a WAV " \
"header to the file") "header to the file.")
static char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le", static char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le",
"u16_be", "s16_be", "fixed32", "float32", "u16_be", "s16_be", "fixed32", "float32",
...@@ -105,7 +105,7 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '), ...@@ -105,7 +105,7 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
VLC_FOURCC('s','p','i','f') }; VLC_FOURCC('s','p','i','f') };
#define FILE_TEXT N_("Output file") #define FILE_TEXT N_("Output file")
#define FILE_LONGTEXT N_("File to which the audio samples will be written to") #define FILE_LONGTEXT N_("File to which the audio samples will be written to.")
vlc_module_begin(); vlc_module_begin();
set_description( N_("File audio output") ); set_description( N_("File audio output") );
......
...@@ -91,7 +91,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -91,7 +91,7 @@ static int Open( vlc_object_t *p_this )
p_sys->p_jack_client = jack_client_new( "vlc" ); p_sys->p_jack_client = jack_client_new( "vlc" );
if( p_sys->p_jack_client == NULL ) if( p_sys->p_jack_client == NULL )
{ {
msg_Err( p_aout, "Failed to connect to JACK server" ); msg_Err( p_aout, "failed to connect to JACK server" );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -120,7 +120,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -120,7 +120,7 @@ static int Open( vlc_object_t *p_this )
if( p_sys->p_jack_port[i] == NULL ) if( p_sys->p_jack_port[i] == NULL )
{ {
msg_Err( p_aout, "Failed to register a JACK port" ); msg_Err( p_aout, "failed to register a JACK port" );
jack_client_close( p_sys->p_jack_client ); jack_client_close( p_sys->p_jack_client );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -130,7 +130,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -130,7 +130,7 @@ static int Open( vlc_object_t *p_this )
/* Tell the JACK server we are ready */ /* Tell the JACK server we are ready */
if( jack_activate( p_sys->p_jack_client ) ) if( jack_activate( p_sys->p_jack_client ) )
{ {
msg_Err( p_aout, "Failed to activate JACK client" ); msg_Err( p_aout, "failed to activate JACK client" );
jack_client_close( p_sys->p_jack_client ); jack_client_close( p_sys->p_jack_client );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -156,14 +156,14 @@ static int Open( vlc_object_t *p_this ) ...@@ -156,14 +156,14 @@ static int Open( vlc_object_t *p_this )
jack_port_name( p_sys->p_jack_port[i] ), jack_port_name( p_sys->p_jack_port[i] ),
pp_in_ports[i_in]) ) pp_in_ports[i_in]) )
{ {
msg_Err( p_aout, "Failed to connect port %s to port %s", msg_Err( p_aout, "failed to connect port %s to port %s",
jack_port_name( p_sys->p_jack_port[i] ), jack_port_name( p_sys->p_jack_port[i] ),
pp_in_ports[i_in] ); pp_in_ports[i_in] );
} }
else else
{ {
msg_Dbg( p_aout, "Connecting port %s to port %s", msg_Dbg( p_aout, "connecting port %s to port %s",
jack_port_name( p_sys->p_jack_port[i] ), jack_port_name( p_sys->p_jack_port[i] ),
pp_in_ports[i_in] ); pp_in_ports[i_in] );
} }
......
...@@ -155,7 +155,7 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -155,7 +155,7 @@ static void Probe( aout_instance_t * p_aout )
{ {
if ( !(i_chanmask & DSP_BIND_FRONT) ) if ( !(i_chanmask & DSP_BIND_FRONT) )
{ {
msg_Err( p_aout, "No front channels ! (%x)", msg_Err( p_aout, "no front channels! (%x)",
i_chanmask ); i_chanmask );
return; return;
} }
...@@ -167,7 +167,7 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -167,7 +167,7 @@ static void Probe( aout_instance_t * p_aout )
| AOUT_CHAN_LFE)) ) | AOUT_CHAN_LFE)) )
{ {
val.i_int = AOUT_VAR_5_1; val.i_int = AOUT_VAR_5_1;
text.psz_string = N_("5.1"); text.psz_string = "5.1";
var_Change( p_aout, "audio-device", var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text ); VLC_VAR_ADDCHOICE, &val, &text );
} }
...@@ -254,7 +254,7 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -254,7 +254,7 @@ static void Probe( aout_instance_t * p_aout )
} }
else if( config_GetInt( p_aout, "spdif" ) ) else if( config_GetInt( p_aout, "spdif" ) )
{ {
msg_Warn( p_aout, "s/pdif not supported by card" ); msg_Warn( p_aout, "S/PDIF not supported by card" );
} }
} }
......
/***************************************************************************** /*****************************************************************************
* portaudio.c : portaudio (v19) audio output plugin * portaudio.c : portaudio (v19) audio output plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 the VideoLAN team * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Frederic Ruget <frederic.ruget@free.fr> * Authors: Frederic Ruget <frederic.ruget@free.fr>
...@@ -174,7 +174,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -174,7 +174,7 @@ static int Open( vlc_object_t * p_this )
vlc_value_t val; vlc_value_t val;
int i_err; int i_err;
msg_Dbg( p_aout, "Entering Open()"); msg_Dbg( p_aout, "entering Open()");
/* Allocate p_sys structure */ /* Allocate p_sys structure */
p_sys = (aout_sys_t *)malloc( sizeof(aout_sys_t) ); p_sys = (aout_sys_t *)malloc( sizeof(aout_sys_t) );
...@@ -207,7 +207,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -207,7 +207,7 @@ static int Open( vlc_object_t * p_this )
/* Close device for now. We'll re-open it later on */ /* Close device for now. We'll re-open it later on */
if( ( i_err = Pa_Terminate() ) != paNoError ) if( ( i_err = Pa_Terminate() ) != paNoError )
{ {
msg_Err( p_aout, "Pa_Terminate returned %d", i_err ); msg_Err( p_aout, "closing the device returned %d", i_err );
} }
b_init = VLC_TRUE; b_init = VLC_TRUE;
...@@ -432,7 +432,7 @@ static int PAOpenDevice( aout_instance_t *p_aout ) ...@@ -432,7 +432,7 @@ static int PAOpenDevice( aout_instance_t *p_aout )
if( p_sys->deviceInfo->maxOutputChannels >= 6 ) if( p_sys->deviceInfo->maxOutputChannels >= 6 )
{ {
val.i_int = AOUT_VAR_5_1; val.i_int = AOUT_VAR_5_1;
text.psz_string = N_("5.1"); text.psz_string = "5.1";
var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE,
&val, &text ); &val, &text );
msg_Dbg( p_aout, "device supports 5.1 channels" ); msg_Dbg( p_aout, "device supports 5.1 channels" );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment