From 013d38071c3579a2006baf107b9f43cbef0bc569 Mon Sep 17 00:00:00 2001
From: Thibaut Mattern <tmattern@users.sourceforge.net>
Date: Tue, 7 Mar 2006 08:03:08 +0000
Subject: Fixed channels to mode translation in audio decoders. Patch from
 Chris Brien.

CVS patchset: 7922
CVS date: 2006/03/07 08:03:08
---
 src/libxineadec/fooaudio.c | 4 ++--
 src/libxineadec/nsf.c      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/libxineadec')

diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index 8460c1265..14a8eb0c9 100644
--- a/src/libxineadec/fooaudio.c
+++ b/src/libxineadec/fooaudio.c
@@ -21,7 +21,7 @@
  * player. It really works too! It will output a continuous sine wave in
  * place of the data it should actually send.
  *
- * $Id: fooaudio.c,v 1.14 2004/12/16 13:59:12 mroi Exp $
+ * $Id: fooaudio.c,v 1.15 2006/03/07 08:03:21 tmattern Exp $
  */
 
 #include <stdio.h>
@@ -116,7 +116,7 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
 /*      this->bits_per_sample, */
       16,
       this->sample_rate,
-/*      (this->channels == 2) ? AO_CAP_MODE_STEREO : AO_CAP_MODE_MONO);*/
+/*      _x_ao_channels2mode(this->channels));*/
       AO_CAP_MODE_MONO);
   }
 
diff --git a/src/libxineadec/nsf.c b/src/libxineadec/nsf.c
index 53185c1d5..28ed3677f 100644
--- a/src/libxineadec/nsf.c
+++ b/src/libxineadec/nsf.c
@@ -20,7 +20,7 @@
  * NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte
  *   http://www.baisoku.org/
  *
- * $Id: nsf.c,v 1.8 2004/12/16 13:59:12 mroi Exp $
+ * $Id: nsf.c,v 1.9 2006/03/07 08:03:22 tmattern Exp $
  */
 
 #include <stdio.h>
@@ -131,7 +131,7 @@ static void nsf_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
       this->stream,
       this->bits_per_sample,
       this->sample_rate,
-      (this->channels == 2) ? AO_CAP_MODE_STEREO : AO_CAP_MODE_MONO);
+      _x_ao_channels2mode(this->channels));
   }
 
   /* if the audio still isn't open, do not go any further with the decode */
-- 
cgit v1.2.3