use _x_ao_mode2channels in post-plugins

CVS patchset: 5829
CVS date: 2003/12/03 10:52:41

1 files changed, 3 insertions, 19 deletions

diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c
index ee3c905d1..7b2427b83 100644
--- a/src/post/visualizations/oscope.c
+++ b/src/post/visualizations/oscope.c
@@ -20,7 +20,7 @@
  * Basic Oscilloscope Visualization Post Plugin For xine
  *   by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: oscope.c,v 1.14 2003/11/26 19:30:17 mroi Exp $
+ * $Id: oscope.c,v 1.15 2003/12/03 10:52:41 andruil Exp $
  *
  */
 
@@ -201,22 +201,6 @@ static int oscope_rewire_video(xine_post_out_t *output_gen, void *data)
   return 1;
 }
 
-static int mode_channels( int mode ) {
-  switch( mode ) {
-  case AO_CAP_MODE_MONO:
-    return 1;
-  case AO_CAP_MODE_STEREO:
-    return 2;
-  case AO_CAP_MODE_4CHANNEL:
-    return 4;
-  case AO_CAP_MODE_5CHANNEL:
-    return 5;
-  case AO_CAP_MODE_5_1CHANNEL:
-    return 6;
-  }
-  return 0;
-} 
-
 static int oscope_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream,
 		   uint32_t bits, uint32_t rate, int mode) {
 
@@ -227,9 +211,9 @@ static int oscope_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream,
 
   this->bits = bits;
   this->mode = mode;
-  this->channels = mode_channels(mode);
+  this->channels = _x_ao_mode2channels(mode);
   this->samples_per_frame = rate / FPS;
-  this->sample_rate = rate; 
+  this->sample_rate = rate;
   this->stream = stream;
   this->data_idx = 0;
   init_yuv_planes(&this->yuv, OSCOPE_WIDTH, OSCOPE_HEIGHT);