* ./src/video_output/video_output.c: don't try to change aspect ratio if it

[vlc] / modules / audio_output / oss.c

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 7f8897ea53233952826fecbac581330a2a577cb6..9b65deee652283c24d5589f9167f3805a03299a2 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -2,7 +2,7 @@
  * oss.c : OSS /dev/dsp module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.45 2003/01/14 22:44:29 sam Exp $
+ * $Id: oss.c,v 1.48 2003/01/28 22:03:21 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -57,7 +57,9 @@
 #ifndef AFMT_AC3
 #   define AFMT_AC3        0x00000400                   /* Dolby Digital AC3 */
 #endif
-
+#ifndef AFMT_S16_NE
+#   define AFMT_S16_NE     0x00000010
+#endif
 /*****************************************************************************
  * aout_sys_t: OSS audio output method descriptor
  *****************************************************************************
@@ -90,13 +92,13 @@ static mtime_t BufferDuration( aout_instance_t * p_aout );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define BUGGY_TEXT N_("Try to work around buggy OSS drivers")
+#define BUGGY_TEXT N_("try to work around buggy OSS drivers")
 #define BUGGY_LONGTEXT N_( \
     "Some buggy OSS drivers just don't like when their internal buffers " \
     "are completely filled (the sound gets heavily hashed). If you have one " \
     "of these drivers, then you need to enable this option." )
 
-#define SPDIF_TEXT N_("Try to use S/PDIF output")
+#define SPDIF_TEXT N_("try to use S/PDIF output")
 #define SPDIF_LONGTEXT N_( \
     "Sometimes we attempt to use the S/PDIF output, even if nothing is " \
     "connected to it. Un-checking this option disables this behaviour, " \
@@ -217,6 +219,10 @@ static void Probe( aout_instance_t * p_aout )
     {
         val.psz_string = N_("Mono");
         var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );
+        if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER )
+        {
+            var_Set( p_aout, "audio-device", val );
+        }
     }