summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/audio_out.c20
-rw-r--r--src/xine-engine/audio_out.h6
2 files changed, 24 insertions, 2 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index d04d045f8..e42f1cb90 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
* along with self program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_out.c,v 1.197 2006/02/05 19:18:28 miguelfreitas Exp $
+ * $Id: audio_out.c,v 1.198 2006/03/07 08:03:22 tmattern Exp $
*
* 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
* (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -521,6 +521,24 @@ int _x_ao_mode2channels( int mode ) {
return 0;
}
+int _x_ao_channels2mode( int channels ) {
+
+ switch( channels ) {
+ case 1:
+ return AO_CAP_MODE_MONO;
+ case 2:
+ return AO_CAP_MODE_STEREO;
+ case 3:
+ case 4:
+ return AO_CAP_MODE_4CHANNEL;
+ case 5:
+ return AO_CAP_MODE_5CHANNEL;
+ case 6:
+ return AO_CAP_MODE_5_1CHANNEL;
+ }
+ return AO_CAP_NOCAP;
+}
+
static void audio_filter_compress (aos_t *this, int16_t *mem, int num_frames) {
int i, maxs;
diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h
index 853c338ca..7754ff3a7 100644
--- a/src/xine-engine/audio_out.h
+++ b/src/xine-engine/audio_out.h
@@ -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_out.h,v 1.75 2005/09/11 22:07:48 miguelfreitas Exp $
+ * $Id: audio_out.h,v 1.76 2006/03/07 08:03:29 tmattern Exp $
*/
#ifndef HAVE_AUDIO_OUT_H
#define HAVE_AUDIO_OUT_H
@@ -293,6 +293,10 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, int grab_o
* converts the audio output mode into the number of channels
*/
int _x_ao_mode2channels( int mode );
+/*
+ * converts the number of channels into the audio output mode
+ */
+int _x_ao_channels2mode( int channels );
#define AO_CAP_MIXER_VOL 0x00000100 /* driver supports mixer control */
#define AO_CAP_PCM_VOL 0x00000200 /* driver supports pcm control */