* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.48 2003/01/28 22:03:21 sam Exp $
+ * $Id: oss.c,v 1.54 2003/03/10 10:41:22 massiot Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
# include <machine/soundcard.h>
#endif
-/* AFMT_AC3 is really IEC61937 / IEC60958, mpeg/ac3/dts over spdif */
+/* Patches for ignorant OSS versions */
#ifndef AFMT_AC3
-# define AFMT_AC3 0x00000400 /* Dolby Digital AC3 */
+# define AFMT_AC3 0x00000400 /* Dolby Digital AC3 */
#endif
+
#ifndef AFMT_S16_NE
-# define AFMT_S16_NE 0x00000010
+# 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
*****************************************************************************
"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_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, " \
- "and permanently selects analog PCM output." )
-
vlc_module_begin();
- add_category_hint( N_("OSS"), NULL );
+ add_category_hint( N_("OSS"), NULL, VLC_FALSE );
add_file( "dspdev", "/dev/dsp", aout_FindAndRestart,
- N_("OSS dsp device"), NULL );
- add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT );
- add_bool( "spdif", 1, NULL, SPDIF_TEXT, SPDIF_LONGTEXT );
+ N_("OSS dsp device"), NULL, VLC_FALSE );
+ add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE );
set_description( _("Linux OSS /dev/dsp module") );
set_capability( "audio output", 100 );
add_shortcut( "oss" );
var_Create( p_aout, "audio-device", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
- if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 )
- {
- msg_Err( p_aout, "cannot reset OSS audio device" );
- var_Destroy( p_aout, "audio-device" );
- return;
- }
-
- if ( config_GetInt( p_aout, "spdif" )
- && AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
- {
- i_format = AFMT_AC3;
-
- if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) >= 0
- && i_format == AFMT_AC3 )
- {
- val.psz_string = N_("A/52 over S/PDIF");
- var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );
- }
- }
-
- /* Go to PCM mode. */
- i_format = AFMT_S16_NE;
- if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 ||
- ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 )
- {
- return;
- }
-
+ /* Test for multi-channel. */
#ifdef SNDCTL_DSP_GETCHANNELMASK
if ( aout_FormatNbChannels( &p_aout->output.output ) > 2 )
{
/* Check that the device supports this. */
int i_chanmask;
+
+ /* Reset all. */
+ i_format = AFMT_S16_NE;
+ if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 ||
+ ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 )
+ {
+ msg_Err( p_aout, "cannot reset OSS audio device" );
+ var_Destroy( p_aout, "audio-device" );
+ return;
+ }
+
if ( ioctl( p_sys->i_fd, SNDCTL_DSP_GETCHANNELMASK,
&i_chanmask ) == 0 )
{
}
#endif
+ /* Reset all. */
+ i_format = AFMT_S16_NE;
+ if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 ||
+ ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 )
+ {
+ msg_Err( p_aout, "cannot reset OSS audio device" );
+ var_Destroy( p_aout, "audio-device" );
+ return;
+ }
+
/* Test for stereo. */
i_nb_channels = 2;
if( ioctl( p_sys->i_fd, SNDCTL_DSP_CHANNELS, &i_nb_channels ) >= 0
}
}
+ if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 )
+ {
+ msg_Err( p_aout, "cannot reset OSS audio device" );
+ var_Destroy( p_aout, "audio-device" );
+ return;
+ }
+
+ /* Test for spdif. */
+ if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
+ {
+ i_format = AFMT_AC3;
+
+ if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) >= 0
+ && i_format == AFMT_AC3 )
+ {
+ val.psz_string = N_("A/52 over S/PDIF");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );
+ if( config_GetInt( p_aout, "spdif" ) )
+ var_Set( p_aout, "audio-device", val );
+ }
+ }
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart,
NULL );
}
/* 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;
p_aout->output.output.i_format = AOUT_FMT_S16_NE;
p_aout->output.output.i_physical_channels
= AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARLEFT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
| AOUT_CHAN_LFE;
}
else if ( !strcmp( val.psz_string, N_("2 Front 2 Rear") ) )
msg_Err( p_aout, "internal: can't find audio-device (%s)",
val.psz_string );
free( p_sys );
+ free( val.psz_string );
return VLC_EGENERIC;
}
free( val.psz_string );