Skip to content

V
vlc-1.1
Commit c32ee2a6 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/audio_filter/channel_mixer/headphone.c, src/libvlc.h:
   moved the headphone-dim config option to the headphone plugin.
* modules/demux/demuxdump.c: the demuxdump-file config optin now has a default value.
* src/libvlc.c: fixed the extraintf config option not to spawn an interface plugin when an invalid name has been given.
parent a8bded2e
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 28 deletions
modules/audio_filter/channel_mixer/headphone.c
View file @ c32ee2a6
......@@ -3,7 +3,7 @@
* -> gives the feeling of a real room with a simple headphone
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: headphone.c,v 1.3 2003/02/11 17:20:44 babal Exp $
* $Id: headphone.c,v 1.4 2003/03/29 12:22:15 gbazin Exp $
*
* Authors: Boris Dors <babal@via.ecp.fr>
*
......@@ -45,7 +45,15 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define HEADPHONE_DIM_TEXT N_("characteristic dimension")
#define HEADPHONE_DIM_LONGTEXT N_( \
"Headphone virtual spatialization effect parameter: "\
"distance between front left speaker and listener in meters.")
vlc_module_begin();
add_category_hint( N_("headphone"), NULL, VLC_FALSE );
add_integer( "headphone-dim", 5, NULL, HEADPHONE_DIM_TEXT,
HEADPHONE_DIM_LONGTEXT, VLC_TRUE );
set_description( _("headphone channel mixer with virtual spatialization effect") );
set_capability( "audio filter", 0 );
set_callbacks( Create, Destroy );
......
modules/demux/demuxdump.c
View file @ c32ee2a6
......@@ -2,7 +2,7 @@
* demuxdump.c : Pseudo demux module for vlc (dump raw stream)
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: demuxdump.c,v 1.5 2003/02/20 01:52:46 sigmunau Exp $
* $Id: demuxdump.c,v 1.6 2003/03/29 12:22:15 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -45,13 +45,16 @@ static void Desactivate ( vlc_object_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define FILE_TEXT N_("dump file name")
#define FILE_LONGTEXT N_( \
"specify a file name to which the raw stream will be dumped." )
vlc_module_begin();
set_description( _("Dump Demux input") );
set_capability( "demux", 0 );
add_category_hint( "File", NULL, VLC_FALSE );
add_string( "demuxdump-file", NULL, NULL,
"dump file name",
"file name for dumping raw stream read by demux", VLC_FALSE );
add_string( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT,
FILE_LONGTEXT, VLC_FALSE );
set_callbacks( Activate, Desactivate );
add_shortcut( "dump" );
vlc_module_end();
......@@ -92,7 +95,8 @@ static int Activate( vlc_object_t * p_this )
psz_name = config_GetPsz( p_input, "demuxdump-file" );
if( !psz_name || !*psz_name )
{
psz_name = strdup( "stream-demux.dump" );
msg_Warn( p_input, "no dump file name given" );
return VLC_EGENERIC;
}
p_demux = malloc( sizeof( demux_sys_t ) );
......@@ -111,7 +115,7 @@ static int Activate( vlc_object_t * p_this )
"cannot create `%s' for writing",
psz_name );
free( p_demux );
return( -1 );
return VLC_EGENERIC;
}
else
{
......@@ -137,7 +141,7 @@ static int Activate( vlc_object_t * p_this )
if( p_demux->p_file != stdout )
fclose( p_demux->p_file );
free( p_demux );
return( -1 );
return VLC_EGENERIC;
}
input_AddProgram( p_input, 0, 0 );
p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
......@@ -153,7 +157,7 @@ static int Activate( vlc_object_t * p_this )
p_input->stream.p_selected_program->b_is_ok = 1;
vlc_mutex_unlock( &p_input->stream.stream_lock );
return( 0 );
return VLC_SUCCESS;
}
/*****************************************************************************
......@@ -239,4 +243,3 @@ static int Demux( input_thread_t * p_input )
return( 1 );
}
src/libvlc.c
View file @ c32ee2a6
......@@ -2,7 +2,7 @@
* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.c,v 1.71 2003/03/26 00:56:22 gbazin Exp $
* $Id: libvlc.c,v 1.72 2003/03/29 12:22:15 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -519,7 +519,7 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
psz_parser = psz_modules;
while ( psz_parser && *psz_parser )
{
char *psz_module;
char *psz_module, *psz_temp;
psz_module = psz_parser;
psz_parser = strchr( psz_module, ',' );
if ( psz_parser )
......@@ -527,7 +527,13 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
*psz_parser = '\0';
psz_parser++;
}
VLC_AddIntf( 0, psz_module, VLC_FALSE );
psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") );
if( psz_temp )
{
sprintf( psz_temp, "%s,none", psz_module );
VLC_AddIntf( 0, psz_temp, VLC_FALSE );
free( psz_temp );
}
}
if ( psz_modules )
{
......@@ -574,7 +580,7 @@ int VLC_AddIntf( int i_object, char const *psz_module, vlc_bool_t b_block )
if( p_intf == NULL )
{
msg_Err( p_vlc, "interface initialization failed" );
msg_Err( p_vlc, "interface \"%s\" initialization failed", psz_module );
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
......
src/libvlc.h
View file @ c32ee2a6
......@@ -2,7 +2,7 @@
* libvlc.h: main libvlc header
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.h,v 1.50 2003/03/26 00:56:22 gbazin Exp $
* $Id: libvlc.h,v 1.51 2003/03/29 12:22:15 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -126,11 +126,6 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL };
"long periods of time.\nIt works with any source format from mono " \
"to 5.1.")
#define HEADPHONE_DIM_TEXT N_("characteristic dimension")
#define HEADPHONE_DIM_LONGTEXT N_( \
"Headphone virtual spatialization effect parameter: "\
"distance between front left speaker and listener in meters.")
#define VOUT_TEXT N_("video output module")
#define VOUT_LONGTEXT N_( \
"This option allows you to select the video output method used by VLC. " \
......@@ -475,8 +470,6 @@ vlc_module_begin();
add_integer( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, VLC_TRUE );
add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE );
add_bool( "headphone", 0, NULL, HEADPHONE_TEXT, HEADPHONE_LONGTEXT, VLC_FALSE );
add_integer( "headphone-dim", 5, NULL, HEADPHONE_DIM_TEXT,
HEADPHONE_DIM_LONGTEXT, VLC_TRUE );
/* Video options */
add_category_hint( N_("Video"), NULL, VLC_FALSE );
......@@ -554,15 +547,15 @@ vlc_module_begin();
ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, VLC_TRUE );
/* CPU options */
add_category_hint( N_("CPU"), NULL, VLC_FALSE );
add_category_hint( N_("CPU"), NULL, VLC_TRUE );
#if defined( __i386__ )
add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, VLC_FALSE );
add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, VLC_FALSE );
add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT, VLC_FALSE );
add_bool( "sse", 1, NULL, SSE_TEXT, SSE_LONGTEXT, VLC_FALSE );
add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, VLC_TRUE );
add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, VLC_TRUE );
add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT, VLC_TRUE );
add_bool( "sse", 1, NULL, SSE_TEXT, SSE_LONGTEXT, VLC_TRUE );
#endif
#if defined( __powerpc__ ) || defined( SYS_DARWIN )
add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, VLC_FALSE );
add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, VLC_TRUE );
#endif
/* Playlist options */
......
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