[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-audio-cvs
Subject:    [Audio-cvs] device/platform/unix audAndroid.cpp, 1.1.2.6.2.3,
From:       sfu () helixcommunity ! org
Date:       2011-05-12 12:12:30
Message-ID: 201105121212.p4CCCPIm018171 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/audio/device/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8403

Modified Files:
      Tag: hxclient_3_6_1_atlas
	audAndroid.cpp 
Log Message:
merge number of channels check fix from atlas310 branch

Index: audAndroid.cpp
===================================================================
RCS file: /cvsroot/audio/device/platform/unix/audAndroid.cpp,v
retrieving revision 1.1.2.6.2.3
retrieving revision 1.1.2.6.2.4
diff -u -d -r1.1.2.6.2.3 -r1.1.2.6.2.4
--- audAndroid.cpp	1 Apr 2011 05:32:56 -0000	1.1.2.6.2.3
+++ audAndroid.cpp	12 May 2011 12:12:28 -0000	1.1.2.6.2.4
@@ -444,13 +444,18 @@
     if (pFormat->uBitsPerSample != 16)
     {
         //Not quite the real error, but it is what we need to return.
-        retCode = RA_AOE_DEVBUSY;
+        retCode = RA_AOE_BADFORMAT;
         goto donechecking;
     }
 
     //TODO: check sample rate
     
-    //TODO: check num channels
+    //Check number of channels. Android so far only support stereo/mono
+    if (pFormat->uChannels > 2)
+    {
+        retCode = RA_AOE_BADFORMAT;
+        goto donechecking;
+    }
  
     //Close the audio device.
   donechecking:


_______________________________________________
Audio-cvs mailing list
Audio-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/audio-cvs
[prev in list] [next in list] [prev in thread] [next in thread]