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
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* Copyright (C) 2005, 2006 the VideoLAN team
* $Id$
*
* Authors: Boris Dorès <babal@via.ecp.fr>
......@@ -44,8 +44,8 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( N_("Simple decoder for dolby surround encoded streams") );
set_shortname( _("Dolby surround decoder") );
set_description( N_("Simple decoder for Dolby Surround encoded streams") );
set_shortname( _("Dolby Surround decoder") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC );
set_capability( "audio filter", 5 );
......@@ -105,7 +105,7 @@ static int Create( vlc_object_t *p_this )
p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
if ( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "Out of memory" );
msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC;
}
p_filter->p_sys->i_left = -1;
......
......@@ -2,7 +2,7 @@
* headphone.c : headphone virtual spatialization channel mixer module
* -> 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$
*
* Authors: Boris Dorès <babal@via.ecp.fr>
......@@ -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_LONGTEXT N_( \
"The delay which is introduced by the physical algorithm may "\
"sometimes be disturbing for the lipsync. In that case, turn "\
"this on to compensate.")
"sometimes be disturbing for the synchronization between lips-movement "\
"and speech. In case, turn this on to compensate.")
#define HEADPHONE_DOLBY_TEXT N_("No decoding of Dolby Surround")
#define HEADPHONE_DOLBY_LONGTEXT N_( \
......@@ -344,7 +344,7 @@ static int Create( vlc_object_t *p_this )
if ( p_filter->output.i_physical_channels
!= (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;
}
......@@ -380,7 +380,7 @@ static int Create( vlc_object_t *p_this )
}
if ( ! b_fit )
{
msg_Dbg( p_filter, "Requesting specific format" );
msg_Dbg( p_filter, "requesting specific format" );
return VLC_EGENERIC;
}
......@@ -388,7 +388,7 @@ static int Create( vlc_object_t *p_this )
p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
if ( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "Out of memory" );
msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC;
}
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,
byte_t * p_overflow;
byte_t * p_slide;
size_t i_overflow_size;/* in bytes */
size_t i_out_size;/* in bytes */
size_t i_overflow_size; /* in bytes */
size_t i_out_size; /* in bytes */
unsigned int i, j;
......
/*****************************************************************************
* 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$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
......@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor
*****************************************************************************/
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_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC );
......
/*****************************************************************************
* trivial.c : trivial channel mixer plug-in (drops unwanted channels)
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor
*****************************************************************************/
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_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC );
......
/*****************************************************************************
* a52tospdif.c : encapsulates A/52 frames into S/PDIF packets
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -50,7 +50,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......@@ -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 )
{
/* AC3 is natively big endian. Most SPDIF devices have the native
* endianness of the computersystem.
* On MAc OS X however, little endian devices are also common.
* endianness of the computer system.
* 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_be[6] = { 0xF8, 0x72, 0x4E, 0x1F, 0x00, 0x01 };
......
/*****************************************************************************
* dtstofloat32.c: DTS Coherent Acoustics decoder plugin for VLC.
* This plugin makes use of libdts to do the actual decoding
* (http://www.videolan.org/dtsdec/).
* This plugin makes use of libdca to do the actual decoding
* (http://developers.videolan.org/libdca.html).
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* Copyright (C) 2001, 2002libdca the VideoLAN team
* $Id$
*
* Author: Gildas Bazin <gbazin@videolan.org>
......@@ -31,7 +31,7 @@
#include <stdlib.h> /* malloc(), free() */
#include <string.h> /* strdup() */
#include <dts.h> /* libdts header file */
#include <dts.h> /* libdca header file */
#include <vlc/decoder.h>
#include "aout_internal.h"
......@@ -52,7 +52,7 @@ static int OpenFilter ( vlc_object_t * );
static void CloseFilter( vlc_object_t * );
static block_t *Convert( filter_t *, block_t * );
/* libdts channel order */
/* libdca channel order */
static const uint32_t pi_channels_in[] =
{ AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_LFE, 0 };
......@@ -66,9 +66,9 @@ static const uint32_t pi_channels_out[] =
*****************************************************************************/
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 */
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;
int i_nb_channels; /* number of float32 per sample */
......@@ -89,7 +89,7 @@ struct filter_sys_t
vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC );
set_shortname( _("DTS" ) );
set_shortname( _("DCA" ) );
set_description( _("DTS Coherent Acoustics audio decoder") );
add_bool( "dts-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
set_capability( "audio filter", 100 );
......@@ -215,11 +215,11 @@ static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
}
//p_sys->i_flags |= DTS_ADJUST_LEVEL;
/* Initialize libdts */
/* Initialize libdca */
p_sys->p_libdts = dts_init( 0 );
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;
}
......@@ -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,
&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;
return;
}
......@@ -316,7 +316,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
&& !p_sys->b_dontwarn )
{
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,
i_flags & DTS_CHANNEL_MASK );
......
/*****************************************************************************
* dtstospdif.c : encapsulates DTS frames into S/PDIF packets
*****************************************************************************
* Copyright (C) 2003 the VideoLAN team
* Copyright (C) 2003, 2006 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
......@@ -67,7 +67,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, Close );
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$
*
* 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 *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* fixed32tos16.c : converter from fixed32 to signed 16 bits integer
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* 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 *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* float32tos16.c : converter from float32 to signed 16 bits integer
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* float32tos8.c : converter from float32 to signed 8 bits integer
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Xavier Maillard <zedek@fxgsproject.org>
......@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* float32tou16.c : converter from float32 to unsigned 16 bits integer
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Xavier Maillard <zedek@fxgsproject.org>
......@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* float32tou8.c : converter from float32 to unsigned 8 bits integer
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Xavier Maillard <zedek@fxgsproject.org>
......@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* 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$
*
* Authors: Marc Ariberti <marcari@videolan.ord>
......@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* 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$
*
* Authors: Samuel Hocevar <sam@zoy.org>
......@@ -47,7 +47,7 @@ static void DoWork24 ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* s16tofloat32swab.c : converter from signed 16 bits integer to float32
* with endianness change
*****************************************************************************
* Copyright (C) 2002-2005 the VideoLAN team
* Copyright (C) 2002-2006 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
......@@ -59,7 +59,7 @@ vlc_module_begin();
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC );
set_description(
_("audio filter for s16->float32 with endianness conversion") );
_("Audio filter for s16->float32 with endianness conversion") );
set_capability( "audio filter", 1 );
set_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* s8tofloat32.c : converter from signed 8 bits integer to float32.
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
......@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* u8tofixed32.c : converter from unsigned 8 bits integer to fixed32.
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
......@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* u8tofloat32.c : converter from unsigned 8 bits integer to float32.
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
......@@ -45,7 +45,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, NULL );
vlc_module_end();
......
/*****************************************************************************
* equalizer.c:
*****************************************************************************
* Copyright (C) 2004 the VideoLAN team
* Copyright (C) 2004, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......@@ -54,19 +54,19 @@ static void Close( vlc_object_t * );
#define BANDS_TEXT N_( "Bands gain")
#define BANDS_LONGTEXT N_( \
"Don't use presets, manually specify bands. You need to provide " \
"10 values between -20dB and 20dB, separated by spaces, like " \
"\"0 2 4 2 0 -2 -4 -2 0\"" )
"Don't use presets, but manually specified bands. You need to " \
"provide 10 values between -20dB and 20dB, separated by spaces, " \
"e.g. \"0 2 4 2 0 -2 -4 -2 0\"" )
#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.")
#define PREAMP_TEXT N_("Global gain" )
#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)." )
vlc_module_begin();
set_description( _("Equalizer 10 bands") );
set_description( _("Equalizer with 10 bands") );
set_shortname( N_("Equalizer" ) );
set_capability( "audio filter", 0 );
set_category( CAT_AUDIO );
......@@ -148,7 +148,7 @@ static int Open( vlc_object_t *p_this )
b_fit = VLC_FALSE;
p_filter->input.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 ) )
{
......@@ -291,7 +291,7 @@ static int EqzInit( aout_filter_t *p_filter, int i_rate )
else
{
/* TODO compute the coeffs on the fly */
msg_Err( p_filter, "unsupported rate" );
msg_Err( p_filter, "rate not supported" );
return VLC_EGENERIC;
}
......
......@@ -198,7 +198,7 @@ static struct
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("audio filter for PCM format conversion") );
set_description( _("Audio filter for PCM format conversion") );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC );
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$
*
* Authors: Clément Stenac <zorglub@videolan.org>
......@@ -109,7 +109,7 @@ static int Open( vlc_object_t *p_this )
b_fit = VLC_FALSE;
p_filter->input.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 ) )
......
......@@ -114,7 +114,7 @@ static int Open( vlc_object_t *p_this )
b_fit = VLC_FALSE;
p_filter->input.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 ) )
{
......
/*****************************************************************************
* bandlimited.c : band-limited interpolation resampler
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
......@@ -81,7 +81,7 @@ struct aout_filter_sys_t
vlc_module_begin();
set_category( CAT_AUDIO );
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_callbacks( Create, Close );
vlc_module_end();
......
/*****************************************************************************
* linear.c : linear interpolation resampler
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
......@@ -62,14 +62,14 @@ struct filter_sys_t
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("audio filter for linear interpolation resampling") );
set_description( _("Audio filter for linear interpolation resampling") );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC );
set_capability( "audio filter", 5 );
set_callbacks( Create, Close );
add_submodule();
set_description( _("audio filter for linear interpolation resampling") );
set_description( _("Audio filter for linear interpolation resampling") );
set_capability( "audio filter2", 5 );
set_callbacks( OpenFilter, CloseFilter );
vlc_module_end();
......
/*****************************************************************************
* trivial.c : trivial resampler (skips samples or pads with zeroes)
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("audio filter for trivial resampling") );
set_description( _("Audio filter for trivial resampling") );
set_capability( "audio filter", 1 );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC );
......
/*****************************************************************************
* ugly.c : ugly resampler (changes pitch)
*****************************************************************************
* Copyright (C) 2002 the VideoLAN team
* Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
......@@ -43,7 +43,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("audio filter for ugly resampling") );
set_description( _("Audio filter for ugly resampling") );
set_capability( "audio filter", 2 );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC );
......
......@@ -201,7 +201,7 @@ static void Probe( aout_instance_t * p_aout,
break;
case 6:
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, &val, &text );
break;
......@@ -566,9 +566,9 @@ static int Open( vlc_object_t *p_this )
#endif
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. "
"Using %d Hz instead.\n", i_old_rate,
p_aout->output.output.i_rate );
msg_Warn( p_aout, "The rate %d Hz is not supported by your " \
"hardware. Using %d Hz instead.\n", i_old_rate, \
p_aout->output.output.i_rate );
}
/* Set buffer size. */
......
......@@ -415,7 +415,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARCENTER;
continue;
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 )
......@@ -637,7 +637,7 @@ static int OpenSPDIF( aout_instance_t * p_aout )
p_streams = (AudioStreamID *)malloc( i_param_size );
if( p_streams == NULL )
{
msg_Err( p_aout, "Out of memory" );
msg_Err( p_aout, "out of memory" );
return VLC_FALSE;
}
......@@ -1012,7 +1012,7 @@ static void Probe( aout_instance_t * p_aout )
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" ) )
{
/* I we selected to prefer SPDIF output if available
/* We selected to prefer SPDIF output if available
* then this "dummy" entry should be selected */