X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Foss.c;h=ee21df3f1db4743d0086328e9a970033b848df16;hb=0597403277c49d3fc23da19fb6f6954e984bae86;hp=118cdc415bf1d488d2644aeac51d922d54d0efd1;hpb=be400691f55a66d411e9bd7787feb1f4332612f0;p=vlc

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 118cdc415b..ee21df3f1d 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -106,20 +106,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( N_("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,
+    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_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true );
+        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
@@ -283,7 +284,7 @@ static int Open( vlc_object_t *p_this )
         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 );
@@ -517,7 +518,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, false ) )
+                           VLC_THREAD_PRIORITY_OUTPUT ) )
     {
         msg_Err( p_aout, "cannot create OSS thread (%m)" );
         close( p_sys->i_fd );