update to liba52 v 0.7.0 including the dynamic range compensation feature (disabled by default, enable it in your .xinerc if you want it)

CVS patchset: 515
CVS date: 2001/08/29 00:51:57

2 files changed, 14 insertions, 14 deletions

diff --git a/src/audio_out/audio_alsa05_out.c b/src/audio_out/audio_alsa05_out.c
index 79c547414..d66bc192a 100644
--- a/src/audio_out/audio_alsa05_out.c
+++ b/src/audio_out/audio_alsa05_out.c
@@ -21,10 +21,10 @@
  * Plugin for ALSA Version 0.5.x
  *
  * Credits go
- * for the SPDIF AC3 sync part
+ * for the SPDIF A52 sync part
  * (c) 2000 Andy Lo A Foe <andy@alsaplayer.org>
  *
- * $Id: audio_alsa05_out.c,v 1.8 2001/08/25 08:19:58 guenter Exp $
+ * $Id: audio_alsa05_out.c,v 1.9 2001/08/29 00:51:57 guenter Exp $
  */
 
 /* required for swab() */
@@ -174,7 +174,7 @@ static int ao_alsa_open(ao_driver_t *this_gen,uint32_t bits, uint32_t rate, int
   switch (ao_mode) {
 
   case AO_CAP_MODE_STEREO:
-  case AO_CAP_MODE_AC3:
+  case AO_CAP_MODE_A52:
     channels = 2;
     break;
 
@@ -206,7 +206,7 @@ static int ao_alsa_open(ao_driver_t *this_gen,uint32_t bits, uint32_t rate, int
   this->bytes_in_buffer        = 0;
   this->direction              = SND_PCM_CHANNEL_PLAYBACK;
 
-  if (ao_mode == AO_CAP_MODE_AC3) {
+  if (ao_mode == AO_CAP_MODE_A52) {
     this->pcm_default_device = 2;
     mode = SND_PCM_MODE_BLOCK;
   }
@@ -295,7 +295,7 @@ static int ao_alsa_open(ao_driver_t *this_gen,uint32_t bits, uint32_t rate, int
   this->stop_mode = pcm_chan_params.stop_mode;
   this->ao_mode = ao_mode;
 
-  if (ao_mode == AO_CAP_MODE_AC3) {
+  if (ao_mode == AO_CAP_MODE_A52) {
         pcm_chan_params.digital.dig_valid      = 1;
         pcm_chan_params.digital.dig_status[0]  = SND_PCM_DIG0_NONAUDIO;
         pcm_chan_params.digital.dig_status[0] |= SND_PCM_DIG0_PROFESSIONAL;
@@ -528,8 +528,8 @@ ao_driver_t *init_audio_out_plugin(config_values_t *config) {
 	   this->pcm_default_device);
 
   this->capabilities = AO_CAP_MODE_STEREO;
-  if (config->lookup_int (config, "ac3_pass_through", 0)) 
-    this->capabilities |= AO_CAP_MODE_AC3;
+  if (config->lookup_int (config, "a52_pass_through", 0)) 
+    this->capabilities |= AO_CAP_MODE_A52;
 
 
   this->ao_driver.get_capabilities    = ao_alsa_get_capabilities;
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index c0534673b..a205be43f 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.34 2001/08/25 08:11:41 guenter Exp $
+ * $Id: audio_oss_out.c,v 1.35 2001/08/29 00:51:57 guenter Exp $
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -79,7 +79,7 @@
 #endif
 
 #ifndef AFMT_AC3
-#       define AFMT_AC3         0x00000400      /* Dolby Digital AC3 */
+#       define AFMT_AC3         0x00000400  
 #endif
 
 #define AO_OUT_OSS_IFACE_VERSION 2
@@ -167,9 +167,9 @@ static int ao_oss_open(ao_driver_t *this_gen,
 
   /*
    * configure audio device
-   * In AC3 mode, skip all other SNDCTL commands
+   * In A52 mode, skip all other SNDCTL commands
    */
-  if(!(mode & AO_CAP_MODE_AC3)) {
+  if(!(mode & AO_CAP_MODE_A52)) {
     tmp = (mode & AO_CAP_MODE_STEREO) ? 1 : 0;
     ioctl(this->audio_fd,SNDCTL_DSP_STEREO,&tmp);
 
@@ -225,7 +225,7 @@ static int ao_oss_open(ao_driver_t *this_gen,
     ioctl(this->audio_fd, SNDCTL_DSP_CHANNELS, &tmp);
     this->num_channels = tmp;
     break;
-  case AO_CAP_MODE_AC3:
+  case AO_CAP_MODE_A52:
     tmp = AFMT_AC3;
     if (ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp) < 0 || tmp != AFMT_AC3) {
         printf("audio_oss_out: AC3 SNDCTL_DSP_SETFMT failed. %d\n",tmp);
@@ -233,7 +233,7 @@ static int ao_oss_open(ao_driver_t *this_gen,
     }
     this->num_channels = 2; /* FIXME: is this correct ? */
     this->output_sample_rate = this->input_sample_rate;
-    printf ("audio_oss_out : AO_CAP_MODE_AC3\n");
+    printf ("audio_oss_out : AO_CAP_MODE_A52\n");
     break;
   }
 
@@ -548,7 +548,7 @@ 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)) {
-      this->capabilities |= AO_CAP_MODE_AC3;
+      this->capabilities |= AO_CAP_MODE_A52;
       printf ("ac3-pass-through ");
     } else 
       printf ("(ac3-pass-through not enabled in .xinerc)");