[xine-cvs] CVS: xine-lib/src/libvorbis xine_decoder.c,1.43,1.44

[Thibaut M. <tma...@us...>]

Update of /cvsroot/xine/xine-lib/src/libvorbis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4108/src/libvorbis

Modified Files:
	xine_decoder.c 
Log Message:
Fixed channels to mode translation in audio decoders.

Patch from Chris Brien.



Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libvorbis/xine_decoder.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xine_decoder.c	27 Jan 2005 11:17:28 -0000	1.43
+++ xine_decoder.c	7 Mar 2006 08:03:10 -0000	1.44
@@ -166,28 +166,7 @@
 	
 	get_metadata (this);
 
-	
-	switch (this->vi.channels) {
-	case 1: 
-	  mode = AO_CAP_MODE_MONO;
-	  break;
-	case 2: 
-	  mode = AO_CAP_MODE_STEREO;
-	  break;
-	case 4: 
-	  mode = AO_CAP_MODE_4CHANNEL;
-	  break;
-	case 5: 
-	  mode = AO_CAP_MODE_5CHANNEL;
-	  break;
-	case 6: 
-	  mode = AO_CAP_MODE_5_1CHANNEL;
-	  break;
-	default:
-	  printf ("libvorbis: help, %d channels ?!\n",
-		  this->vi.channels);
-	  /* FIXME: handle error */
-	}
+	mode = _x_ao_channels2mode(this->vi.channels);
 	
 	this->convsize=MAX_NUM_SAMPLES/this->vi.channels;