mozilla-central: changeset 122230:725e172de3586cdcce4bacbff14b41d3a02efd7a

author	Randy Lin <rlin@mozilla.com>
	Mon, 18 Feb 2013 18:21:29 +0800
changeset 122230	725e172de3586cdcce4bacbff14b41d3a02efd7a
parent 122229	ff752cb0c0cbfc6a0d3725511505adf3eb290cf5
child 122231	9a708c976f45bfa822b3d7a634faf7afe263a366
push id	24327
push user	gszorc@mozilla.com
push date	Tue, 19 Feb 2013 05:22:32 +0000
treeherder	mozilla-central@e8f8a3f6f1f6 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	kinetik
bugs	837573
milestone	21.0a1
first release with	nightly linux32 e8f8a3f6f1f6 / 21.0a1 / 20130219031055 / files nightly linux64 e8f8a3f6f1f6 / 21.0a1 / 20130219031055 / files nightly mac e8f8a3f6f1f6 / 21.0a1 / 20130219031055 / files nightly win32 e8f8a3f6f1f6 / 21.0a1 / 20130219031055 / files nightly win64 e8f8a3f6f1f6 / 21.0a1 / 20130219031055 / files
last release without	nightly linux32 0acbd06d48a9 / 21.0a1 / 20130218031106 / files nightly linux64 0acbd06d48a9 / 21.0a1 / 20130218031106 / files nightly mac 0acbd06d48a9 / 21.0a1 / 20130218031106 / files nightly win32 0acbd06d48a9 / 21.0a1 / 20130218031106 / files nightly win64 0acbd06d48a9 / 21.0a1 / 20130218031106 / files

--- a/media/libsydneyaudio/src/sydney_audio_gonk.cpp
+++ b/media/libsydneyaudio/src/sydney_audio_gonk.cpp
@@ -153,17 +153,17 @@ sa_stream_open(sa_stream_t *s) {
   if (s == NULL) {
     return SA_ERROR_NO_INIT;
   }
   if (s->output_unit != NULL) {
     return SA_ERROR_INVALID;
   }
 
   int32_t chanConfig = s->channels == 1 ?
-    AudioSystem::CHANNEL_OUT_MONO : AudioSystem::CHANNEL_OUT_STEREO;
+    AUDIO_CHANNEL_OUT_MONO : AUDIO_CHANNEL_OUT_STEREO;
 
   int frameCount;
   if (AudioTrack::getMinFrameCount(&frameCount, s->streamType,
                                    s->rate) != NO_ERROR) {
     return SA_ERROR_INVALID;
   }
   int minsz = frameCount * s->channels * sizeof(int16_t);