string review, round two: the audio output modules

(but as I'm too tired and it's apero time, round three
will follow later on in the night)

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 167c256cd0f532aababd478576a0a67c097ee2eb..0a8eb50bb0abb86d4705da4f70c5fe6ca8761f31 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -2,7 +2,7 @@
  * alsa.c : alsa plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: alsa.c,v 1.36 2003/10/25 00:49:13 sam Exp $
+ * $Id: alsa.c,v 1.37 2004/01/25 17:32:29 murray Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org> - Original Author
  *          Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
@@ -79,7 +79,7 @@ struct aout_sys_t
 /* Why not ? --Bozo */
 /* Right. --Meuuh */
 
-#define DEFAULT_ALSA_DEVICE "default"
+#define DEFAULT_ALSA_DEVICE N_("default")
 
 /*****************************************************************************
  * Local prototypes
@@ -96,8 +96,8 @@ static void ALSAFill     ( aout_instance_t * );
 vlc_module_begin();
     add_category_hint( N_("ALSA"), NULL, VLC_FALSE );
     add_string( "alsadev", DEFAULT_ALSA_DEVICE, aout_FindAndRestart,
-                N_("ALSA device name"), NULL, VLC_FALSE );
-    set_description( _("ALSA audio output") );
+                N_("ALSA Device Name"), NULL, VLC_FALSE );
+    set_description( _("ALSA Audio Output") );
     set_capability( "audio output", 150 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -114,7 +114,7 @@ static void Probe( aout_instance_t * p_aout,
     int i_ret;
 
     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 );
 
     /* We'll open the audio device in non blocking mode so we can just exit

diff --git a/modules/audio_output/arts.c b/modules/audio_output/arts.c
index c5fa937f33e235328ea91d4e4ebe96d1d0c86d70..64e856e406695155f13bf877755b4f3a719e0b11 100644 (file)
--- a/modules/audio_output/arts.c
+++ b/modules/audio_output/arts.c
@@ -2,7 +2,7 @@
  * arts.c : aRts module
  *****************************************************************************
  * Copyright (C) 2001-2002 VideoLAN
- * $Id: arts.c,v 1.18 2003/03/30 18:14:36 gbazin Exp $
+ * $Id: arts.c,v 1.19 2004/01/25 17:32:29 murray Exp $
  *
  * Authors: Emmanuel Blindauer <manu@agat.net>
  *          Samuel Hocevar <sam@zoy.org>
@@ -63,7 +63,7 @@ static void Play         ( aout_instance_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-   set_description( _("aRts audio output") );
+   set_description( _("aRts Audio Output") );
    set_capability( "audio output", 50 );
    set_callbacks( Open, Close );
 vlc_module_end();

diff --git a/modules/audio_output/coreaudio.c b/modules/audio_output/coreaudio.c
index f699c4501acae162b8e8b2f53544702dc8f48452..82acfe09a34f02911ecf05aa102b3720e5a32b10 100644 (file)
--- a/modules/audio_output/coreaudio.c
+++ b/modules/audio_output/coreaudio.c
@@ -2,7 +2,7 @@
  * coreaudio.c: CoreAudio output plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: coreaudio.c,v 1.7 2003/11/25 21:21:36 hartman Exp $
+ * $Id: coreaudio.c,v 1.8 2004/01/25 17:32:29 murray Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -215,13 +215,13 @@ static OSStatus StreamListener   ( AudioStreamID inStream,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define ADEV_TEXT N_("Audio device")
+#define ADEV_TEXT N_("Audio Device")
 #define ADEV_LONGTEXT N_("Choose a number corresponding to the number of an " \
-    "audio device, as listed in your 'audio device' menu. This device will " \
+    "audio device, as listed in your 'Audio Device' menu. This device will " \
     "then be used by default for audio playback.")
 
 vlc_module_begin();
-    set_description( _("CoreAudio output") );
+    set_description( _("CoreAudio Output") );
     set_capability( "audio output", 100 );
     set_callbacks( Open, Close );
     add_category_hint( N_("Audio"), NULL, VLC_FALSE );
@@ -653,7 +653,7 @@ static int InitHardwareInfo( aout_instance_t * p_aout )
                                         &i_param_size, NULL );
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not get number of devices: [%4.4s]",
+        msg_Err( p_aout, "could not get number of devices: [%4.4s]",
                  (char *)&err );
         vlc_mutex_unlock( &p_sys->lock );
         return( VLC_EGENERIC );
@@ -684,7 +684,7 @@ static int InitHardwareInfo( aout_instance_t * p_aout )
                                     &i_param_size, (void *)p_devices );
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not get the device ID's: [%4.4s]",
+        msg_Err( p_aout, "could not get the device ID's: [%4.4s]",
                  (char *)&err );
         free( (void *)p_devices );
         vlc_mutex_unlock( &p_sys->lock );
@@ -696,7 +696,7 @@ static int InitHardwareInfo( aout_instance_t * p_aout )
                                     &i_param_size, (void *)&devid_def );
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not get default audio device: [%4.4s]",
+        msg_Err( p_aout, "could not get default audio device: [%4.4s]",
                  (char *)&err );
         free( (void *)p_devices );
         vlc_mutex_unlock( &p_sys->lock );
@@ -772,7 +772,7 @@ static int InitDeviceInfo( UInt32 i_dev, aout_instance_t * p_aout )
                                       &i_param_size, NULL ); 
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not get size of devicename: [%4.4s]",
+        msg_Err( p_aout, "could not get size of devicename: [%4.4s]",
                  (char *)&err ); 
         return( VLC_EGENERIC );
     }
@@ -791,7 +791,7 @@ static int InitDeviceInfo( UInt32 i_dev, aout_instance_t * p_aout )
                                   &i_param_size, p_dev->psz_device_name ); 
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not get devicename: [%4.4s]",
+        msg_Err( p_aout, "could not get devicename: [%4.4s]",
                  (char *)&err );
         free( (void *)p_dev->psz_device_name );
         return( VLC_EGENERIC );
@@ -805,7 +805,7 @@ static int InitDeviceInfo( UInt32 i_dev, aout_instance_t * p_aout )
                                       &i_param_size, NULL );
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not get size of stream configuration: [%4.4s]",
+        msg_Err( p_aout, "could not get size of stream configuration: [%4.4s]",
                  (char *)&err );
         free( (void *)p_dev->psz_device_name );
         return( VLC_EGENERIC );
@@ -824,7 +824,7 @@ static int InitDeviceInfo( UInt32 i_dev, aout_instance_t * p_aout )
                                   &i_param_size, p_buffer_list );
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not get stream configuration: [%4.4s]",
+        msg_Err( p_aout, "could not get stream configuration: [%4.4s]",
                  (char *)&err );
         free( (void *)p_dev->psz_device_name );
         free( (void *)p_buffer_list );
@@ -995,7 +995,7 @@ static int InitStreamInfo( UInt32 i_dev, aout_instance_t * p_aout,
                                       &i_param_size, NULL );
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not retrieve the number of streams: [%4.4s]",
+        msg_Err( p_aout, "could not retrieve the number of streams: [%4.4s]",
                  (char *)&err );
         return( VLC_EGENERIC );
     }
@@ -1019,7 +1019,7 @@ static int InitStreamInfo( UInt32 i_dev, aout_instance_t * p_aout,
                                   &i_param_size, P_STREAMS );
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could no get the streams: [%4.4s]",
+        msg_Err( p_aout, "could no get the streams: [%4.4s]",
                  (char *)&err );
         free( (void *)P_STREAMS );
         return( VLC_EGENERIC );
@@ -1141,7 +1141,7 @@ static int InitDevice( aout_instance_t * p_aout )
                                   &i_param_size, &p_sys->b_dev_alive );
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not check whether device is alive: %4.4s",
+        msg_Err( p_aout, "could not check whether device is alive: %4.4s",
                  (char *)&err );
         return( VLC_EGENERIC );
     }
@@ -1171,7 +1171,7 @@ static int InitDevice( aout_instance_t * p_aout )
                                   (void *)&p_sys->sfmt_revert );
     if( err != noErr )
     {
-        msg_Err( p_aout, "Could not retrieve the original streamformat: [%4.4s]",
+        msg_Err( p_aout, "could not retrieve the original streamformat: [%4.4s]",
                  (char *)&err );
         return( VLC_EGENERIC ); 
     }
@@ -1212,7 +1212,7 @@ static int InitDevice( aout_instance_t * p_aout )
                                       &P_STREAMS[i_stream] ); 
         if( err != noErr )
         {
-            msg_Err( p_aout, "Could not set the stream format: [%4.4s]",
+            msg_Err( p_aout, "could not set the stream format: [%4.4s]",
                      (char *)&err );
             vlc_mutex_unlock( &w.lock );
             vlc_mutex_destroy( &w.lock );
@@ -1409,7 +1409,7 @@ static OSStatus DeviceListener( AudioDeviceID inDevice,
                                           &i_param_size, &p_sys->b_dev_alive );
             if( err != noErr )
             {
-                msg_Err( p_aout, "Could not determine wether device is alive: %4.4s",
+                msg_Err( p_aout, "could not determine wether device is alive: %4.4s",
                          (char *)&err );
             }
         }
@@ -1470,7 +1470,7 @@ static void InitDeviceVar( aout_instance_t * p_aout, int i_option,
     }
 
     var_Create( p_aout, "audio-device", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
-    text.psz_string = _("Audio device");
+    text.psz_string = ADEV_TEXT;
     var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
 
     for( i = 0; i < p_sys->i_options; i++ )

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 59ce6fb781dcb8684b9fb8b6f6c1eb093ead6408..6cb69583bfe832d3b3e2deef9433b5ccd0e41dbb 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -2,7 +2,7 @@
  * directx.c: Windows DirectX audio output method
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: directx.c,v 1.24 2003/12/15 21:35:37 gbazin Exp $
+ * $Id: directx.c,v 1.25 2004/01/25 17:32:29 murray Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -206,7 +206,7 @@ static void InterleaveS16     ( int16_t *, int16_t *, int *, int );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("DirectX audio output") );
+    set_description( _("DirectX Audio Output") );
     set_capability( "audio output", 100 );
     add_shortcut( "directx" );
     set_callbacks( OpenAudio, CloseAudio );
@@ -380,7 +380,7 @@ static void Probe( aout_instance_t * p_aout )
     DWORD ui_speaker_config;
 
     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 5.1 support */

diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c
index 68dcb9e6381af030f392d7c2c17e3e0a6d30ff8c..b4b10e25d2e345c68558ff84c5e5557fb9b1720b 100644 (file)
--- a/modules/audio_output/esd.c
+++ b/modules/audio_output/esd.c
@@ -2,7 +2,7 @@
  * esd.c : EsounD module
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: esd.c,v 1.19 2003/06/25 21:17:21 asmax Exp $
+ * $Id: esd.c,v 1.20 2004/01/25 17:32:29 murray Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -63,7 +63,7 @@ static void Play         ( aout_instance_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("EsounD audio output") );
+    set_description( _("EsounD Audio Output") );
     set_capability( "audio output", 50 );
     set_callbacks( Open, Close );
     add_shortcut( "esound" );

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index f52c3362ba60808023c7e33ec448759b70704d3c..b7a1bc7d5efb9213f3321e461058949442262e79 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -2,7 +2,7 @@
  * file.c : audio output which writes the samples to a file
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: file.c,v 1.24 2003/11/05 00:39:16 gbazin Exp $
+ * $Id: file.c,v 1.25 2004/01/25 17:32:29 murray Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -79,7 +79,7 @@ static void    Play        ( aout_instance_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define FORMAT_TEXT N_("Output format")
+#define FORMAT_TEXT N_("Output Format")
 #define FORMAT_LONGTEXT N_("One of \"u8\", \"s8\", \"u16\", \"s16\", " \
                         "\"u16_le\", \"s16_le\", \"u16_be\", " \
                         "\"s16_be\", \"fixed32\", \"float32\" or \"spdif\"")
@@ -101,7 +101,7 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
                             VLC_FOURCC('f','l','3','2'),
                             VLC_FOURCC('s','p','i','f') };
 
-#define FILE_TEXT N_("Output file")
+#define FILE_TEXT N_("Output File")
 #define FILE_LONGTEXT N_("File to which the audio samples will be written to")
 
 vlc_module_begin();
@@ -159,7 +159,7 @@ static int Open( vlc_object_t * p_this )
 
     if ( *ppsz_compare == NULL )
     {
-        msg_Err( p_aout, "Cannot understand the format string (%s)",
+        msg_Err( p_aout, "cannot understand the format string (%s)",
                  psz_format );
         fclose( p_aout->output.p_sys->p_file );
         free( p_aout->output.p_sys );

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 393a0438b4bcc83fb95e6d051c51c57082cd664d..bdb880f7e6cf1b4001675463fb52fe5b4fadc76a 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -2,7 +2,7 @@
  * oss.c : OSS /dev/dsp module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.61 2003/12/22 14:32:55 sam Exp $
+ * $Id: oss.c,v 1.62 2004/01/25 17:32:29 murray Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Sam Hocevar <sam@zoy.org>
@@ -109,7 +109,7 @@ vlc_module_begin();
     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_description( _("Linux OSS audio output") );
+    set_description( _("Linux OSS Audio Output") );
     set_capability( "audio output", 100 );
 
     add_shortcut( "oss" );
@@ -126,7 +126,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. */

diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c
index b70b6896a700cca7d30aff6b44da8f3851848282..001dfd24c21fc669282eb1a13e2ef25bf73dbd76 100644 (file)
--- a/modules/audio_output/sdl.c
+++ b/modules/audio_output/sdl.c
@@ -2,7 +2,7 @@
  * sdl.c : SDL audio output plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2002 VideoLAN
- * $Id: sdl.c,v 1.24 2003/12/22 14:32:55 sam Exp $
+ * $Id: sdl.c,v 1.25 2004/01/25 17:32:29 murray Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Sam Hocevar <sam@zoy.org>
@@ -65,7 +65,7 @@ static void SDLCallback ( void *, byte_t *, int );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Simple DirectMedia Layer audio output") );
+    set_description( _("Simple DirectMedia Layer Audio Output") );
     set_capability( "audio output", 40 );
     add_shortcut( "sdl" );
     set_callbacks( Open, Close );
@@ -173,7 +173,7 @@ static int Open ( vlc_object_t *p_this )
         {
             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 );
 
             val.i_int = (obtained.channels == 2) ? AOUT_VAR_STEREO :
@@ -191,7 +191,7 @@ static int Open ( vlc_object_t *p_this )
         /* First launch. */
         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 );
 
         val.i_int = AOUT_VAR_STEREO;

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 41505c360700decb3d061105f7f0823e4f6a10ab..5ab0ed5928a8e6c3722f39b093c7672fb018655a 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -2,7 +2,7 @@
  * waveout.c : Windows waveOut plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: waveout.c,v 1.26 2003/07/11 23:14:03 gbazin Exp $
+ * $Id: waveout.c,v 1.27 2004/01/25 17:32:29 murray Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *      
@@ -132,7 +132,7 @@ static void InterleaveS16( int16_t *, int *, int );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Win32 waveOut extension output") );
+    set_description( _("Win32 waveOut Extension Output") );
     set_capability( "audio output", 50 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -334,7 +334,7 @@ static void Probe( aout_instance_t * p_aout )
     unsigned int i_physical_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 5.1 support */