diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-14 13:32:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-14 13:32:56 +0000 |
| commit | 56bab444c3bc89bb63aac728f549bd3261d01f6f (patch) | |
| tree | 45cc14d923fd83d2bada44dbc4054ce05bac3e65 /variablespeed | |
| parent | 9ddd5eebd43aeaeb2e5b366b497e7576ca5c3ef9 (diff) | |
| parent | f12ca3072b5cbe4b43aa6dce1ab27a1c33e3a99f (diff) | |
| download | android_frameworks_ex-56bab444c3bc89bb63aac728f549bd3261d01f6f.tar.gz android_frameworks_ex-56bab444c3bc89bb63aac728f549bd3261d01f6f.tar.bz2 android_frameworks_ex-56bab444c3bc89bb63aac728f549bd3261d01f6f.zip | |
Merge "AArch64: Fix GetChannelCount() declaration."
Diffstat (limited to 'variablespeed')
| -rw-r--r-- | variablespeed/jni/variablespeed.cc | 2 | ||||
| -rw-r--r-- | variablespeed/jni/variablespeed.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/variablespeed/jni/variablespeed.cc b/variablespeed/jni/variablespeed.cc index 73ac609..b5d9067 100644 --- a/variablespeed/jni/variablespeed.cc +++ b/variablespeed/jni/variablespeed.cc @@ -564,7 +564,7 @@ SLuint32 AudioEngine::GetChannelCount() { } static void CreateAndRealizeAudioPlayer(SLuint32 slSampleRate, - size_t channelCount, SLuint32 slChannels, SLint32 audioStreamType, SLObjectItf &outputMix, + SLuint32 channelCount, SLuint32 slChannels, SLint32 audioStreamType, SLObjectItf &outputMix, SLObjectItf &audioPlayer, SLEngineItf &engineInterface) { // Define the source and sink for the audio player: comes from a buffer queue // and goes to the output mix. diff --git a/variablespeed/jni/variablespeed.h b/variablespeed/jni/variablespeed.h index 07cba0f..cf856da 100644 --- a/variablespeed/jni/variablespeed.h +++ b/variablespeed/jni/variablespeed.h @@ -86,7 +86,7 @@ class AudioEngine { bool HasSampleRateAndChannels(); SLuint32 GetSLSampleRate(); SLuint32 GetSLChannels(); - size_t GetChannelCount(); + SLuint32 GetChannelCount(); // The single global audio engine instance. static AudioEngine* audioEngine_; |