* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.36 2002/12/07 15:25:26 gbazin 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>
* 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
# 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
*****************************************************************************
/*****************************************************************************
* 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_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_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 );
set_description( _("Linux OSS /dev/dsp module") );
set_capability( "audio output", 100 );
add_shortcut( "oss" );
return;
}
- if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
+ 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_("S/PDIF");
+ val.psz_string = N_("A/52 over S/PDIF");
var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val );
}
}
/* 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 );
+ }
}
+
+
+ var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart,
+ NULL );
}
/*****************************************************************************
/* Open the sound device */
p_sys->i_fd = open( psz_device, O_WRONLY );
- free( psz_device );
if( p_sys->i_fd < 0 )
{
msg_Err( p_aout, "cannot open audio device (%s)", psz_device );
free( p_sys );
return VLC_EGENERIC;
}
+ free( psz_device );
p_aout->output.pf_play = Play;
- if ( var_Type( p_aout, "audio-device" ) < 0 )
+ if ( var_Type( p_aout, "audio-device" ) == 0 )
{
Probe( p_aout );
}
return VLC_EGENERIC;
}
- if ( !strcmp( val.psz_string, N_("S/PDIF") ) )
+ if ( !strcmp( val.psz_string, N_("A/52 over S/PDIF") ) )
{
p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i');
}
= AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARLEFT;
}
- else if ( !strcmp( val.psz_string, "Stereo" ) )
+ else if ( !strcmp( val.psz_string, N_("Stereo") ) )
{
p_aout->output.output.i_format = AOUT_FMT_S16_NE;
p_aout->output.output.i_physical_channels
= AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
}
- else if ( !strcmp( val.psz_string, "Mono" ) )
+ else if ( !strcmp( val.psz_string, N_("Mono") ) )
{
p_aout->output.output.i_format = AOUT_FMT_S16_NE;
p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER;
}
+ else
+ {
+ /* This should not happen ! */
+ msg_Err( p_aout, "internal: can't find audio-device (%s)",
+ val.psz_string );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
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 )
{
if( ioctl( p_sys->i_fd, SNDCTL_DSP_CHANNELS, &i_nb_channels ) < 0 ||
i_nb_channels != aout_FormatNbChannels( &p_aout->output.output ) )
{
- msg_Err( p_aout, "cannot set number of audio channels (%x)",
+ msg_Err( p_aout, "cannot set number of audio channels (%s)",
aout_FormatPrintChannels( &p_aout->output.output) );
close( p_sys->i_fd );
free( p_sys );
msleep( delay / 2 );
}
}
-
+
while( !p_aout->b_die && ! ( p_buffer =
aout_OutputNextBuffer( p_aout, next_date, VLC_TRUE ) ) )
{
projects / vlc / blobdiff