Copyright fixes

[vlc] / modules / audio_output / oss.c

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 9818d46e458e2f7dd298eefa8708af854cc8e645..a92e7d71a42248e5039f71b616d8302e32b5ddf6 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * oss.c : OSS /dev/dsp module for vlc
  *****************************************************************************
- * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.58 2003/05/04 22:42:15 gbazin Exp $
+ * Copyright (C) 2000-2002 VideoLAN (Centrale Réseaux) and its contributors
+ * $Id$
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
- *          Samuel Hocevar <sam@zoy.org>
+ *          Sam Hocevar <sam@zoy.org>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -55,7 +55,7 @@
 
 /* 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
@@ -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
 {
@@ -98,20 +98,23 @@ static mtime_t BufferDuration( aout_instance_t * p_aout );
 /*****************************************************************************
  * 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." )
 
 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();
@@ -126,7 +129,7 @@ static void Probe( aout_instance_t * p_aout )
     int i_format, i_nb_channels;
 
     var_Create( p_aout, "audio-device", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
-    text.psz_string = _("Audio device");
+    text.psz_string = _("Audio Device");
     var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
 
     /* Test for multi-channel. */
@@ -249,6 +252,10 @@ static void Probe( aout_instance_t * p_aout )
             if( config_GetInt( p_aout, "spdif" ) )
                 var_Set( p_aout, "audio-device", val );
         }
+        else if( config_GetInt( p_aout, "spdif" ) )
+        {
+            msg_Warn( p_aout, "s/pdif not supported by card" );
+        }
     }
 
     var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart,
@@ -258,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 )
@@ -279,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;
     }
@@ -529,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 )
 {