README updates.

The README.xinerc now contains all config items which might appear.
Some are left for developers to add meanings.
Some typo changes.

CVS patchset: 543
CVS date: 2001/09/01 18:00:16

3 files changed, 61 insertions, 13 deletions

diff --git a/doc/README.xinerc b/doc/README.xinerc
index f8b15f742..2e3318907 100644
--- a/doc/README.xinerc
+++ b/doc/README.xinerc
@@ -12,10 +12,33 @@ a52_level               0..~200% : a/52 volume control
 
 a52_pass_through        1/0 : enable a/52 output via spdif port
 
+alsa_default_device	Device name used for mono.
+			(e.g. default)
+
+alsa_front_device	Device name used for stereo.
+			(e.g. front)
+
+alsa_surround40_device	Device name used for 4-channel.
+			(e.g. surround40)
+
+alsa_surround50_device	Device name used for 5-channel.
+			(e.g. surround50)
+
+alsa_surround51_device	Device name used for 6-channel.
+			(e.g. surround51)
+
+alsa_a52_device		Device name used for a/52 passthrough.
+			(e.g. iec958:AES0=0x6,AES1=0x82,AES2=0x0,AES3=0x2)
+
 audio_driver_name       audio driver to use, same as command line 
                         option -A
                         (e.g. alsa05, alsa09, arts, esd, sun)
 
+audio_resample_mode	Adjust whether resampling is done or not.
+			1 force off
+			2 force on
+			Anything else sets it to auto.
+
 colorkey                colorkey to use, may be usefull to change
                         if parts of your desktop become transparent
 
@@ -54,7 +77,7 @@ oss_device_num		-1, 0-16: Forces the OSS plugin to use the specified
 			If -1 (default) is specified, the audio device with
 			the best capabilities will be used.
 			Note: /dev/dsp is usually a symlink to /dev/dsp0
-
+           
 skin                    skin to use, see <prefix>/share/xine/skins
                         for installed skins
                         (e.g. default, metal, lcd, pitt, xinetic)
@@ -70,5 +93,30 @@ win32_path              path to where you have installed win32
 zoom_mpeg1              1/0 : enable automatic zoom of small
                         (e.g. mpeg1) videos to double size
 
+xine_debug		Various decimal values.
+			See ./xine-lib/xine-engine/monitor.h
+			for a list.
+
+The following exist, but details are not yet available.
+control_x		Unknown
+control_y		Unknown
+demux_strategy          Unknown
+oss_static_delay	Unknown
+panel_x			Unknown
+panel_y			Unknown
+panel_visible		Unknown
+playlist_x		Unknown
+playlist_y		Unknown
+sun_static_delay	Unknown
+XV_COLORKEY		Unknown
+XV_BRIGHTNESS		Unknown
+XV_CONTRAST		Unknown
+XV_SATURATION		Unknown
+XV_HUE			Unknown
+x_file_browser		Unknown
+y_file_browser		Unknown
+x_mrl_browser		Unknown
+y_mrl_browser		Unknown
+filebrowser_dir		Unknown
 
 
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index c3f6810d9..b262316f3 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
  * Credits go 
- * - for the SPDIF AC3 sync part
+ * - for the SPDIF A/52 sync part
  * - frame size calculation added (16-08-2001)
  * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
  * for initial ALSA 0.9.x support.
@@ -26,7 +26,7 @@
  * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
  *
  * 
- * $Id: audio_alsa_out.c,v 1.24 2001/08/29 10:31:39 f1rmb Exp $
+ * $Id: audio_alsa_out.c,v 1.25 2001/09/01 18:00:16 jcdutton Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -85,7 +85,7 @@ typedef struct alsa_driver_s {
   char          audio_surround40_device[20];
   char          audio_surround50_device[20];
   char          audio_surround51_device[20];
-  char          audio_ac3_device[128];
+  char          audio_a52_device[128];
   snd_pcm_t    *audio_fd;
   int           capabilities;
   int           open_mode;
@@ -149,7 +149,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int
     break;
   case AO_CAP_MODE_A52:
     this->num_channels = 2;
-    pcm_device = this->audio_ac3_device;
+    pcm_device = this->audio_a52_device;
     break;
   default:
     error ("ALSA Driver does not support the requested mode: 0x%X",mode);
@@ -459,8 +459,8 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) {
   strcpy(this->audio_surround50_device,pcm_device);
   pcm_device = config->lookup_str(config,"alsa_surround51_device", "surround51");
   strcpy(this->audio_surround51_device,pcm_device);
-  pcm_device = config->lookup_str(config,"alsa_ac3_device", "hw:0,2");
-  strcpy(this->audio_ac3_device,pcm_device);
+  pcm_device = config->lookup_str(config,"alsa_a52_device", "iec958:AES0=0x6,AES1=0x82,AES2=0x0,AES3=0x2");
+  strcpy(this->audio_a52_device,pcm_device);
  
   /*
    * find best device driver/channel
@@ -508,7 +508,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) {
   snd_pcm_close (this->audio_fd);
   this->audio_fd=NULL;
   this->output_sample_rate = 0;
-  if (config->lookup_int (config, "ac3_pass_through", 0)) {
+  if (config->lookup_int (config, "a52_pass_through", 0)) {
     this->capabilities |= AO_CAP_MODE_A52;
   }
   printf("audio_alsa_out: Capabilities 0x%X\n",this->capabilities);
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index a205be43f..2ff22cc6d 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.35 2001/08/29 00:51:57 guenter Exp $
+ * $Id: audio_oss_out.c,v 1.36 2001/09/01 18:00:16 jcdutton Exp $
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -196,7 +196,7 @@ static int ao_oss_open(ao_driver_t *this_gen,
 	     this->input_sample_rate, this->output_sample_rate);
   }
   /*
-   * set number of channels / ac3 throughput
+   * set number of channels / a52 passthrough
    */
 
   switch (mode) {
@@ -547,11 +547,11 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) {
 
   ioctl(audio_fd,SNDCTL_DSP_GETFMTS,&caps);
   if (caps & AFMT_AC3) {
-    if (config->lookup_int (config, "ac3_pass_through", 0)) {
+    if (config->lookup_int (config, "a52_pass_through", 0)) {
       this->capabilities |= AO_CAP_MODE_A52;
-      printf ("ac3-pass-through ");
+      printf ("a/52-pass-through ");
     } else 
-      printf ("(ac3-pass-through not enabled in .xinerc)");
+      printf ("(a/52-pass-through not enabled in .xinerc)");
   }    
 
   printf ("\n");