X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Foss.c;h=6ee0688655bd63e73786d86170262f0b672fc5da;hb=52c18c4dec68158eedd655e0502820b7d7b6128f;hp=69e83f4b846dbecb7209334150b99b0b9bfb4c50;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;p=vlc diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index 69e83f4b84..6ee0688655 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -26,16 +26,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ -#include /* open(), O_WRONLY */ -#include /* ioctl() */ -#include /* write(), close() */ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include /* ENOMEM */ +#include /* open(), O_WRONLY */ +#include /* ioctl() */ +#include /* write(), close() */ + +#include +#include #ifdef HAVE_ALLOCA_H # include @@ -49,8 +51,6 @@ # include #elif defined( HAVE_SYS_SOUNDCARD_H ) # include -#elif defined( HAVE_MACHINE_SOUNDCARD_H ) -# include #endif /* Patches for ignorant OSS versions */ @@ -91,7 +91,7 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); static void Play ( aout_instance_t * ); -static int OSSThread ( aout_instance_t * ); +static void* OSSThread ( vlc_object_t * ); static mtime_t BufferDuration( aout_instance_t * p_aout ); @@ -104,20 +104,21 @@ static mtime_t BufferDuration( aout_instance_t * p_aout ); "are completely filled (the sound gets heavily hashed). If you have one " \ "of these drivers, then you need to enable this option." ) -vlc_module_begin(); - set_shortname( "OSS" ); - set_description( _("UNIX OSS audio output") ); +vlc_module_begin () + set_shortname( "OSS" ) + set_description( N_("UNIX OSS audio output") ) - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - add_file( "dspdev", "/dev/dsp", aout_FindAndRestart, - N_("OSS DSP device"), NULL, VLC_FALSE ); - add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE ); + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + add_file( "oss-audio-device", "/dev/dsp", aout_FindAndRestart, + N_("OSS DSP device"), NULL, false ) + add_deprecated_alias( "dspdev" ) /* deprecated since 0.9.3 */ + add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true ) - set_capability( "audio output", 100 ); - add_shortcut( "oss" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "audio output", 100 ) + add_shortcut( "oss" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Probe: probe the audio device for available formats and channels @@ -167,7 +168,7 @@ static void Probe( aout_instance_t * p_aout ) | AOUT_CHAN_LFE)) ) { val.i_int = AOUT_VAR_5_1; - text.psz_string = "5.1"; + text.psz_string = (char*) "5.1"; var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); } @@ -178,7 +179,7 @@ static void Probe( aout_instance_t * p_aout ) | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT)) ) { val.i_int = AOUT_VAR_2F2R; - text.psz_string = N_("2 Front 2 Rear"); + text.psz_string = _("2 Front 2 Rear"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); } @@ -202,7 +203,7 @@ static void Probe( aout_instance_t * p_aout ) && i_nb_channels == 2 ) { val.i_int = AOUT_VAR_STEREO; - text.psz_string = N_("Stereo"); + text.psz_string = _("Stereo"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); } @@ -222,7 +223,7 @@ static void Probe( aout_instance_t * p_aout ) && i_nb_channels == 1 ) { val.i_int = AOUT_VAR_MONO; - text.psz_string = N_("Mono"); + text.psz_string = _("Mono"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); if ( p_aout->output.output.i_physical_channels == AOUT_CHAN_CENTER ) { @@ -246,7 +247,7 @@ static void Probe( aout_instance_t * p_aout ) && i_format == AFMT_AC3 ) { val.i_int = AOUT_VAR_SPDIF; - text.psz_string = N_("A/52 over S/PDIF"); + text.psz_string = _("A/52 over S/PDIF"); var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); if( config_GetInt( p_aout, "spdif" ) ) @@ -278,13 +279,10 @@ static int Open( vlc_object_t *p_this ) /* Allocate structure */ p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } /* Get device name */ - if( (psz_device = config_GetPsz( p_aout, "dspdev" )) == NULL ) + if( (psz_device = config_GetPsz( p_aout, "oss-audio-device" )) == NULL ) { msg_Err( p_aout, "no audio device specified (maybe /dev/dsp?)" ); free( p_sys ); @@ -300,6 +298,7 @@ static int Open( vlc_object_t *p_this ) if( p_sys->i_fd < 0 ) { msg_Err( p_aout, "cannot open audio device (%s)", psz_device ); + free( psz_device ); free( p_sys ); return VLC_EGENERIC; } @@ -320,17 +319,18 @@ static int Open( vlc_object_t *p_this ) if ( var_Get( p_aout, "audio-device", &val ) < 0 ) { /* Probe() has failed. */ + close( p_sys->i_fd ); free( p_sys ); return VLC_EGENERIC; } if ( val.i_int == AOUT_VAR_SPDIF ) { - p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i'); + p_aout->output.output.i_format = VLC_CODEC_SPDIFL; } else if ( val.i_int == AOUT_VAR_5_1 ) { - p_aout->output.output.i_format = AOUT_FMT_S16_NE; + p_aout->output.output.i_format = VLC_CODEC_S16N; p_aout->output.output.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT @@ -338,32 +338,32 @@ static int Open( vlc_object_t *p_this ) } else if ( val.i_int == AOUT_VAR_2F2R ) { - p_aout->output.output.i_format = AOUT_FMT_S16_NE; + p_aout->output.output.i_format = VLC_CODEC_S16N; p_aout->output.output.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT; } else if ( val.i_int == AOUT_VAR_STEREO ) { - p_aout->output.output.i_format = AOUT_FMT_S16_NE; + p_aout->output.output.i_format = VLC_CODEC_S16N; p_aout->output.output.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; } else if ( val.i_int == AOUT_VAR_MONO ) { - p_aout->output.output.i_format = AOUT_FMT_S16_NE; + p_aout->output.output.i_format = VLC_CODEC_S16N; 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 (%i)", val.i_int ); + close( p_sys->i_fd ); free( p_sys ); return VLC_EGENERIC; } - val.b_bool = VLC_TRUE; - var_Set( p_aout, "intf-change", val ); + var_SetBool( p_aout, "intf-change", true ); /* Reset the DSP device */ if( ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ) < 0 ) @@ -388,7 +388,7 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i'); + p_aout->output.output.i_format = VLC_CODEC_SPDIFL; p_aout->output.i_nb_samples = A52_FRAME_NB; p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE; p_aout->output.output.i_frame_length = A52_FRAME_NB; @@ -415,22 +415,22 @@ static int Open( vlc_object_t *p_this ) switch ( i_format ) { case AFMT_U8: - p_aout->output.output.i_format = VLC_FOURCC('u','8',' ',' '); + p_aout->output.output.i_format = VLC_CODEC_U8; break; case AFMT_S8: - p_aout->output.output.i_format = VLC_FOURCC('s','8',' ',' '); + p_aout->output.output.i_format = VLC_CODEC_S8; break; case AFMT_U16_LE: - p_aout->output.output.i_format = VLC_FOURCC('u','1','6','l'); + p_aout->output.output.i_format = VLC_CODEC_U16L; break; case AFMT_S16_LE: - p_aout->output.output.i_format = VLC_FOURCC('s','1','6','l'); + p_aout->output.output.i_format = VLC_CODEC_S16L; break; case AFMT_U16_BE: - p_aout->output.output.i_format = VLC_FOURCC('u','1','6','b'); + p_aout->output.output.i_format = VLC_CODEC_U16B; break; case AFMT_S16_BE: - p_aout->output.output.i_format = VLC_FOURCC('s','1','6','b'); + p_aout->output.output.i_format = VLC_CODEC_S16B; break; default: msg_Err( p_aout, "OSS fell back to an unknown format (%d)", @@ -517,7 +517,7 @@ static int Open( vlc_object_t *p_this ) /* Create OSS thread and wait for its readiness. */ if( vlc_thread_create( p_aout, "aout", OSSThread, - VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_OUTPUT ) ) { msg_Err( p_aout, "cannot create OSS thread (%m)" ); close( p_sys->i_fd ); @@ -533,6 +533,7 @@ static int Open( vlc_object_t *p_this ) *****************************************************************************/ static void Play( aout_instance_t *p_aout ) { + VLC_UNUSED(p_aout); } /***************************************************************************** @@ -545,7 +546,7 @@ static void Close( vlc_object_t * p_this ) vlc_object_kill( p_aout ); vlc_thread_join( p_aout ); - p_aout->b_die = VLC_FALSE; + p_aout->b_die = false; ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL ); close( p_sys->i_fd ); @@ -584,18 +585,20 @@ static mtime_t BufferDuration( aout_instance_t * p_aout ) /***************************************************************************** * OSSThread: asynchronous thread used to DMA the data to the device *****************************************************************************/ -static int OSSThread( aout_instance_t * p_aout ) +static void* OSSThread( vlc_object_t *p_this ) { + aout_instance_t * p_aout = (aout_instance_t*)p_this; struct aout_sys_t * p_sys = p_aout->output.p_sys; mtime_t next_date = 0; + int canc = vlc_savecancel (); - while ( !p_aout->b_die ) + while ( vlc_object_alive (p_aout) ) { aout_buffer_t * p_buffer = NULL; int i_tmp, i_size; - byte_t * p_bytes; + uint8_t * p_bytes; - if ( p_aout->output.output.i_format != VLC_FOURCC('s','p','d','i') ) + if ( p_aout->output.output.i_format != VLC_CODEC_SPDIFL ) { mtime_t buffered = BufferDuration( p_aout ); @@ -615,7 +618,7 @@ static int OSSThread( aout_instance_t * p_aout ) /* Next buffer will be played at mdate() + buffered */ p_buffer = aout_OutputNextBuffer( p_aout, mdate() + buffered, - VLC_FALSE ); + false ); if( p_buffer == NULL && buffered > ( p_aout->output.p_sys->max_buffer_duration @@ -646,8 +649,8 @@ static int OSSThread( aout_instance_t * p_aout ) } } - while( !p_aout->b_die && ! ( p_buffer = - aout_OutputNextBuffer( p_aout, next_date, VLC_TRUE ) ) ) + while( vlc_object_alive (p_aout) && ! ( p_buffer = + aout_OutputNextBuffer( p_aout, next_date, true ) ) ) { msleep( 1000 ); next_date = mdate(); @@ -688,5 +691,6 @@ static int OSSThread( aout_instance_t * p_aout ) } } - return VLC_SUCCESS; + vlc_restorecancel (canc); + return NULL; }