Fixed AFMT_AC3 and AFMT_S16_NE handling.

[vlc] / modules / audio_output / oss.c

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 0e5acf95653b7a8afe0a2ec5a09066f401502744..1fff18229f551ff5ddf11ffc130c3293ff542564 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.44 2003/01/13 14:51:25 massiot Exp $
+ * $Id: oss.c,v 1.50 2003/02/06 15:14:41 massiot 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,20 @@
 #   include <machine/soundcard.h>
 #endif
 
+/* Patches for ignorant OSS versions */
+#ifndef AFMT_AC3
+#   define AFMT_AC3     0x00000400     /* Dolby Digital AC3 */
+#endif
+
+#ifndef AFMT_S16_NE
+#   ifdef WORDS_BIGENDIAN
+#       define AFMT_S16_NE AFMT_S16_BE
+#   else
+#       define AFMT_S16_NE AFMT_S16_LE
+#   endif
+#endif
+
+
 /*****************************************************************************
  * aout_sys_t: OSS audio output method descriptor
  *****************************************************************************
@@ -85,13 +99,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,11 +221,15 @@ 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 );
+        }
     }
 
 
@@ -249,13 +267,18 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* Open the sound device */
-    p_sys->i_fd = open( psz_device, O_WRONLY );
+    p_sys->i_fd = open( psz_device, O_WRONLY | O_NDELAY );
     if( p_sys->i_fd < 0 )
     {
         msg_Err( p_aout, "cannot open audio device (%s)", psz_device );
         free( p_sys );
         return VLC_EGENERIC;
     }
+
+    /* if the opening was ok, put the device back in blocking mode */
+    fcntl( p_sys->i_fd, F_SETFL,
+            fcntl( p_sys->i_fd, F_GETFL ) &~ FNDELAY );
+
     free( psz_device );
 
     p_aout->output.pf_play = Play;
@@ -595,7 +618,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 ) ) )
             {