* Renamed the "headphone" option to "headphone-opt" to avoid error

messages "option headphone does not exist". I'm not clever enough to find
out why it doesn't work when it's named "headphone".

diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index 9d778ec2195ceb2f6cfa500cb13544700a83b31c..2dc0b4daa990f437b206524e792beee190c464b7 100644 (file)
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -2,7 +2,7 @@
  * input.c : internal management of input streams for the audio output
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: input.c,v 1.33 2003/03/04 03:27:40 gbazin Exp $
+ * $Id: input.c,v 1.34 2003/04/06 23:44:53 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -60,7 +60,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input )
     memcpy( &headphone_intermediate_format, &p_aout->mixer.mixer,
             sizeof(audio_sample_format_t) );
     headphone_intermediate_format.i_rate = p_input->input.i_rate;
-    if ( config_GetInt( p_aout , "headphone" ) )
+    if ( config_GetInt( p_aout , "headphone-opt" ) )
     {
         /* Do we use heaphone filter ? */
         if ( intermediate_format.i_physical_channels

diff --git a/src/libvlc.h b/src/libvlc.h
index 0eed79c62e85da692b7100bf4143cef848f8812d..9da6534a6962e6ec81b4794138f812c056594053 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.54 2003/04/06 14:12:46 massiot Exp $
+ * $Id: libvlc.h,v 1.55 2003/04/06 23:44:53 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -471,7 +471,7 @@ vlc_module_begin();
     add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT, VLC_TRUE );
     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_bool( "headphone-opt", 0, NULL, HEADPHONE_TEXT, HEADPHONE_LONGTEXT, VLC_FALSE );
 
     /* Video options */
     add_category_hint( N_("Video"), NULL, VLC_FALSE );