extend help string for speaker arrangement

CVS patchset: 6494
CVS date: 2004/05/07 13:37:00

2 files changed, 100 insertions, 42 deletions

diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 63a1b000b..ab3fd228f 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
  * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
  *
  * 
- * $Id: audio_alsa_out.c,v 1.138 2004/04/30 03:07:33 jcdutton Exp $
+ * $Id: audio_alsa_out.c,v 1.139 2004/05/07 13:37:00 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1287,20 +1287,23 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   int                  err;
   char                *pcm_device;
   snd_pcm_hw_params_t *params;
-  static char         *speaker_arrangement[] = {"Mono", "Stereo", "Headphones", "A52_Passthru", "Surround21", "Surround3", "Surround4", "Surround41", "Surround5", "Surround51", "Surround6", "Surround61", "Surround71", NULL};
-  #define MONO 0
-  #define STEREO 1
-  #define HEADPHONES 2
-  #define A52_PASSTHRU 3
-  #define SURROUND21 4
-  #define SURROUND3  5
-  #define SURROUND4  6
-  #define SURROUND41 7
-  #define SURROUND5  8
-  #define SURROUND51 9
-  #define SURROUND6  10
-  #define SURROUND61 11
-  #define SURROUND71 12
+  /* for usability reasons, keep this in sync with audio_oss_out.c */
+  static char         *speaker_arrangement[] = {"Mono 1.0", "Stereo 2.0", "Headphones 2.0", "Stereo 2.1",
+    "Surround 3.0", "Surround 4.0", "Surround 4.1", "Surround 5.0", "Surround 5.1", "Surround 6.0",
+    "Surround 6.1", "Surround 7.1", "Pass Through", NULL};
+  #define MONO		0
+  #define STEREO	1
+  #define HEADPHONES	2
+  #define SURROUND21	3
+  #define SURROUND3	4
+  #define SURROUND4	5
+  #define SURROUND41	6
+  #define SURROUND5	7
+  #define SURROUND51	8
+  #define SURROUND6	9
+  #define SURROUND61	10
+  #define SURROUND71	11
+  #define A52_PASSTHRU	12
   int speakers;
 
   this = (alsa_driver_t *) xine_xmalloc (sizeof (alsa_driver_t));
@@ -1410,12 +1413,38 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 
   this->capabilities = 0;
 
-  speakers = config->register_enum(config, "audio.speaker_arrangement", 1,
-                        speaker_arrangement,
-                        _("Speaker arrangement"),
-                        _("Select how your speakers are arranged."
-                        "This determines which speakers xine uses for output"),
-                        0,  alsa_speaker_arrangement_cb, this);
+  /* for usability reasons, keep this in sync with audio_oss_out.c */
+  speakers = config->register_enum(config, "audio.speaker_arrangement", STEREO,
+			speaker_arrangement,
+			_("speaker arrangement"),
+			_("Select how your speakers are arranged, "
+			  "this determines which speakers xine uses for sound output. "
+			  "The individual values are:\n\n"
+			  "Mono 1.0: You have only one speaker.\n"
+			  "Stereo 2.0: You have two speakers for left and right channel.\n"
+			  "Headphones 2.0: You use headphones.\n"
+			  "Stereo 2.1: You have two speakers for left and right channel, and one "
+			  "subwoofer for the low frequencies.\n"
+			  "Surround 3.0: You have three speakers for left, right and rear channel.\n"
+			  "Surround 4.0: You have four speakers for front left and right and rear "
+			  "left and right channels.\n"
+			  "Surround 4.1: You have four speakers for front left and right and rear "
+			  "left and right channels, and one subwoofer for the low frequencies.\n"
+			  "Surround 5.0: You have five speakers for front left, center and right and "
+			  "rear left and right channels.\n"
+			  "Surround 5.1: You have five speakers for front left, center and right and "
+			  "rear left and right channels, and one subwoofer for the low frequencies.\n"
+			  "Surround 6.0: You have six speakers for front left, center and right and "
+			  "rear left, center and right channels.\n"
+			  "Surround 6.1: You have six speakers for front left, center and right and "
+			  "rear left, center and right channels, and one subwoofer for the low frequencies.\n"
+			  "Surround 7.1: You have seven speakers for front left, center and right, "
+			  "left and right and rear left and right channels, and one subwoofer for the "
+			  "low frequencies.\n"
+			  "Pass Through: Your sound system will receive undecoded digital sound from xine. "
+			  "You need to connect a digital surround decoder capable of decoding the "
+			  "formats you want to play to your sound card's digital output."),
+			0, alsa_speaker_arrangement_cb, this);
 
   xprintf(class->xine, XINE_VERBOSITY_LOG, _("audio_alsa_out : supported modes are "));
   if (!(snd_pcm_hw_params_test_format(this->audio_fd, params, SND_PCM_FORMAT_U8))) {
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 65a45220a..5612d7f96 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_oss_out.c,v 1.107 2004/04/30 12:57:47 jcdutton Exp $
+ * $Id: audio_oss_out.c,v 1.108 2004/05/07 13:37:00 mroi Exp $
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -727,20 +727,23 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   static char     *sync_methods[] = {"auto", "getodelay", "getoptr", "softsync", "probebuffer", NULL};
   static char     *devname_opts[] = {"auto", "/dev/dsp", "/dev/sound/dsp", NULL};
   int devname_val, devname_num;
-  static char         *speaker_arrangement[] = {"Mono", "Stereo", "Headphones", "A52_Passthru", "Surround21", "Surround3", "Surround4", "Surround41", "Surround5", "Surround51", "Surround6", "Surround61", "Surround71", NULL};
-  #define MONO 0
-  #define STEREO 1
-  #define HEADPHONES 2
-  #define A52_PASSTHRU 3
-  #define SURROUND21 4
-  #define SURROUND3  5
-  #define SURROUND4  6
-  #define SURROUND41 7
-  #define SURROUND5  8
-  #define SURROUND51 9
-  #define SURROUND6  10
-  #define SURROUND61 11
-  #define SURROUND71 12
+  /* for usability reasons, keep this in sync with audio_alsa_out.c */
+  static char     *speaker_arrangement[] = {"Mono 1.0", "Stereo 2.0", "Headphones 2.0", "Stereo 2.1",
+    "Surround 3.0", "Surround 4.0", "Surround 4.1", "Surround 5.0", "Surround 5.1", "Surround 6.0",
+    "Surround 6.1", "Surround 7.1", "Pass Through", NULL};
+  #define MONO		0
+  #define STEREO	1
+  #define HEADPHONES	2
+  #define SURROUND21	3
+  #define SURROUND3	4
+  #define SURROUND4	5
+  #define SURROUND41	6
+  #define SURROUND5	7
+  #define SURROUND51	8
+  #define SURROUND6	9
+  #define SURROUND61	10
+  #define SURROUND71	11
+  #define A52_PASSTHRU	12
   int speakers;
 
   
@@ -935,12 +938,38 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
     return NULL;
   }
 
-  speakers = config->register_enum(config, "audio.speaker_arrangement", 1,
-                        speaker_arrangement,
-                        _("Speaker arrangement"),
-                        _("Select how your speakers are arranged."
-                        "This determines which speakers xine uses for output"),
-                        0,  oss_speaker_arrangement_cb, this);
+  /* for usability reasons, keep this in sync with audio_alsa_out.c */
+  speakers = config->register_enum(config, "audio.speaker_arrangement", STEREO,
+			speaker_arrangement,
+			_("speaker arrangement"),
+			_("Select how your speakers are arranged, "
+			  "this determines which speakers xine uses for sound output. "
+			  "The individual values are:\n\n"
+			  "Mono 1.0: You have only one speaker.\n"
+			  "Stereo 2.0: You have two speakers for left and right channel.\n"
+			  "Headphones 2.0: You use headphones.\n"
+			  "Stereo 2.1: You have two speakers for left and right channel, and one "
+			  "subwoofer for the low frequencies.\n"
+			  "Surround 3.0: You have three speakers for left, right and rear channel.\n"
+			  "Surround 4.0: You have four speakers for front left and right and rear "
+			  "left and right channels.\n"
+			  "Surround 4.1: You have four speakers for front left and right and rear "
+			  "left and right channels, and one subwoofer for the low frequencies.\n"
+			  "Surround 5.0: You have five speakers for front left, center and right and "
+			  "rear left and right channels.\n"
+			  "Surround 5.1: You have five speakers for front left, center and right and "
+			  "rear left and right channels, and one subwoofer for the low frequencies.\n"
+			  "Surround 6.0: You have six speakers for front left, center and right and "
+			  "rear left, center and right channels.\n"
+			  "Surround 6.1: You have six speakers for front left, center and right and "
+			  "rear left, center and right channels, and one subwoofer for the low frequencies.\n"
+			  "Surround 7.1: You have seven speakers for front left, center and right, "
+			  "left and right and rear left and right channels, and one subwoofer for the "
+			  "low frequencies.\n"
+			  "Pass Through: Your sound system will receive undecoded digital sound from xine. "
+			  "You need to connect a digital surround decoder capable of decoding the "
+			  "formats you want to play to your sound card's digital output."),
+			0, oss_speaker_arrangement_cb, this);
 
 
   xprintf(class->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: supported modes are ");