* ./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 e0e1cbe7b60e0d52806a1e27e896eae1adbb8a29..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.43 2003/01/07 15:12:15 massiot 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>
@@ -12,7 +12,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -53,6 +53,13 @@
 #   include <machine/soundcard.h>
 #endif
 
+/* AFMT_AC3 is really IEC61937 / IEC60958, mpeg/ac3/dts over spdif */
+#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
  *****************************************************************************
@@ -85,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, " \
@@ -207,15 +214,20 @@ static void Probe( aout_instance_t * p_aout )
 
     /* Test for mono. */
     i_nb_channels = 1;
-    if( ioctl( p_sys->i_fd, SNDCTL_DSP_CHANNELS, &i_nb_channels ) >= 0  
+    if( ioctl( p_sys->i_fd, SNDCTL_DSP_CHANNELS, &i_nb_channels ) >= 0
          && i_nb_channels == 1 )
     {
         val.psz_string = N_("Mono");
-        var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );        
+        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 );
+        }
     }
 
-    val.b_bool = VLC_TRUE;
-    var_Set( p_aout, "intf-change", val );
+
+    var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart,
+                     NULL );
 }
 
 /*****************************************************************************
@@ -311,6 +323,9 @@ static int Open( vlc_object_t *p_this )
     }
     free( val.psz_string );
 
+    val.b_bool = VLC_TRUE;
+    var_Set( p_aout, "intf-change", val );
+
     /* Reset the DSP device */
     if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 )
     {
@@ -591,7 +606,7 @@ static int OSSThread( aout_instance_t * p_aout )
                     msleep( delay / 2 );
                 }
             }
-            
+
             while( !p_aout->b_die && ! ( p_buffer =
                 aout_OutputNextBuffer( p_aout, next_date, VLC_TRUE ) ) )
             {