[vlc-commits] sndio: use AOUT_CHANS_* values

Rémi Denis-Courmont git at videolan.org
Thu Jul 19 21:37:42 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul 19 22:11:40 2012 +0300| [c84a18eb0c72093f9d73a23bb2069bc05fc7eea5] | committer: Rémi Denis-Courmont

sndio: use AOUT_CHANS_* values

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c84a18eb0c72093f9d73a23bb2069bc05fc7eea5
---

 modules/audio_output/sndio.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/audio_output/sndio.c b/modules/audio_output/sndio.c
index 56872e9..98637b2 100644
--- a/modules/audio_output/sndio.c
+++ b/modules/audio_output/sndio.c
@@ -115,16 +115,16 @@ static int Open (vlc_object_t *obj)
             chans = AOUT_CHAN_CENTER;
             break;
         case 2:
-            chans = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+            chans = AOUT_CHANS_STEREO;
             break;
         case 4:
-            chans = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
-                  | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+            chans = AOUT_CHANS_4_0;
             break;
         case 6:
-            chans = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
-                  | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
-                  | AOUT_CHAN_CENTER | AOUT_CHAN_LFE;
+            chans = AOUT_CHANS_5_1;
+            break;
+        case 8:
+            chans = AOUT_CHANS_7_1;
             break;
         default:
             msg_Err (aout, "unknown %u channels map", par.pchan);



More information about the vlc-commits mailing list