Copyright fixes

[vlc] / modules / audio_output / oss.c

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index bdb880f7e6cf1b4001675463fb52fe5b4fadc76a..a92e7d71a42248e5039f71b616d8302e32b5ddf6 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * oss.c : OSS /dev/dsp module for vlc
  *****************************************************************************
- * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.62 2004/01/25 17:32:29 murray Exp $
+ * Copyright (C) 2000-2002 VideoLAN (Centrale Réseaux) and its contributors
+ * $Id$
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Sam Hocevar <sam@zoy.org>
@@ -70,7 +70,7 @@
  * aout_sys_t: OSS audio output method descriptor
  *****************************************************************************
  * This structure is part of the audio output thread descriptor.
- * It describes the dsp specific properties of an audio device.
+ * It describes the DSP specific properties of an audio device.
  *****************************************************************************/
 struct aout_sys_t
 {
@@ -105,13 +105,16 @@ static mtime_t BufferDuration( aout_instance_t * p_aout );
     "of these drivers, then you need to enable this option." )
 
 vlc_module_begin();
-    add_category_hint( N_("OSS"), NULL, VLC_FALSE );
+    set_shortname( "OSS" );
+    set_description( _("Linux 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 );
+              N_("OSS DSP device"), NULL, VLC_FALSE );
     add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE );
-    set_description( _("Linux OSS Audio Output") );
-    set_capability( "audio output", 100 );
 
+    set_capability( "audio output", 100 );
     add_shortcut( "oss" );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -262,7 +265,7 @@ static void Probe( aout_instance_t * p_aout )
 /*****************************************************************************
  * Open: open the audio device (the digital sound processor)
  *****************************************************************************
- * This function opens the dsp as a usual non-blocking write-only file, and
+ * This function opens the DSP as a usual non-blocking write-only file, and
  * modifies the p_aout->p_sys->i_fd with the file's descriptor.
  *****************************************************************************/
 static int Open( vlc_object_t *p_this )
@@ -283,7 +286,7 @@ static int Open( vlc_object_t *p_this )
     /* Get device name */
     if( (psz_device = config_GetPsz( p_aout, "dspdev" )) == NULL )
     {
-        msg_Err( p_aout, "no audio device given (maybe /dev/dsp ?)" );
+        msg_Err( p_aout, "no audio device specified (maybe /dev/dsp?)" );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -533,7 +536,7 @@ static void Play( aout_instance_t *p_aout )
 }
 
 /*****************************************************************************
- * Close: close the dsp audio device
+ * Close: close the DSP audio device
  *****************************************************************************/
 static void Close( vlc_object_t * p_this )
 {