Whitespace
Change-Id: Ie9fa59703d90fa0a6d4b83d6d5bd637f53d4058c
diff --git a/src/ThreadPool.c b/src/ThreadPool.c
index 20130cf..d9b3f8c 100644
--- a/src/ThreadPool.c
+++ b/src/ThreadPool.c
@@ -257,7 +257,7 @@
return SL_RESULT_RESOURCE_ERROR;
}
closure->mKind = kind;
- switch(kind) {
+ switch (kind) {
case CLOSURE_KIND_PPI:
closure->mHandler.mHandler_ppi = (ClosureHandler_ppi)handler;
break;
diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index da7c7b8..e578128 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -51,7 +51,7 @@
break;
case SL_PLAYSTATE_PAUSED:
SL_LOGV("setting GenericPlayer to SL_PLAYSTATE_PAUSED");
- switch(objState) {
+ switch (objState) {
case ANDROID_UNINITIALIZED:
*pObjState = ANDROID_PREPARING;
ap->prepare();
@@ -69,7 +69,7 @@
break;
case SL_PLAYSTATE_PLAYING: {
SL_LOGV("setting GenericPlayer to SL_PLAYSTATE_PLAYING");
- switch(objState) {
+ switch (objState) {
case ANDROID_UNINITIALIZED:
*pObjState = ANDROID_PREPARING;
ap->prepare();
@@ -442,7 +442,7 @@
SL_LOGV("type %d", type);
audio_stream_type_t newStreamType = ANDROID_DEFAULT_OUTPUT_STREAM_TYPE;
- switch(type) {
+ switch (type) {
case SL_ANDROID_STREAM_VOICE:
newStreamType = AUDIO_STREAM_VOICE_CALL;
break;
@@ -484,7 +484,7 @@
SLresult audioPlayer_getStreamType(CAudioPlayer* ap, SLint32 *pType) {
SLresult result = SL_RESULT_SUCCESS;
- switch(ap->mStreamType) {
+ switch (ap->mStreamType) {
case AUDIO_STREAM_VOICE_CALL:
*pType = SL_ANDROID_STREAM_VOICE;
break;
@@ -670,7 +670,7 @@
u.i = event;
SL_LOGV("sfplayer_handlePrefetchEvent(event='%c%c%c%c' (%d), data1=%d, data2=%d, user=%p) from "
"SfAudioPlayer", u.c[3], u.c[2], u.c[1], u.c[0], event, data1, data2, user);
- switch(event) {
+ switch (event) {
case android::GenericPlayer::kEventPrepared: {
SL_LOGV("Received GenericPlayer::kEventPrepared for CAudioPlayer %p", ap);
@@ -1120,7 +1120,7 @@
return SL_RESULT_CONTENT_UNSUPPORTED;
}
SL_LOGD("source MIME is %s", (char*)df_mime->mimeType);
- switch(df_mime->containerType) {
+ switch (df_mime->containerType) {
case SL_CONTAINERTYPE_MPEG_TS:
if (strcasecmp((char*)df_mime->mimeType, (const char *)XA_ANDROID_MIME_MP2TS)) {
SL_LOGE("Invalid MIME (%s) for container SL_CONTAINERTYPE_MPEG_TS, expects %s",
@@ -1193,7 +1193,7 @@
}
void * callbackPContext = NULL;
- switch(event) {
+ switch (event) {
case android::AudioTrack::EVENT_MORE_DATA: {
//SL_LOGV("received event EVENT_MORE_DATA from AudioTrack TID=%d", gettid());
@@ -1805,7 +1805,7 @@
SLresult android_audioPlayer_setPlaybackRateAndConstraints(CAudioPlayer *ap, SLpermille rate,
SLuint32 constraints) {
SLresult result = SL_RESULT_SUCCESS;
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_PCM_BUFFERQUEUE: {
// these asserts were already checked by the platform-independent layer
assert((AUDIOTRACK_MIN_PLAYBACKRATE_PERMILLE <= rate) &&
@@ -1848,7 +1848,7 @@
if (ap->mAPlayer == 0) {
return SL_RESULT_PARAMETER_INVALID;
}
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_URIFD_TO_PCM_BUFFERQUEUE:
case AUDIOPLAYER_FROM_ADTS_ABQ_TO_PCM_BUFFERQUEUE:
{
@@ -1876,7 +1876,7 @@
return SL_RESULT_PARAMETER_INVALID;
}
SLresult res = SL_RESULT_SUCCESS;
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_URIFD_TO_PCM_BUFFERQUEUE:
case AUDIOPLAYER_FROM_ADTS_ABQ_TO_PCM_BUFFERQUEUE:
{
@@ -1912,7 +1912,7 @@
return SL_RESULT_PARAMETER_INVALID;
}
SLresult res = SL_RESULT_SUCCESS;
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_URIFD_TO_PCM_BUFFERQUEUE:
case AUDIOPLAYER_FROM_ADTS_ABQ_TO_PCM_BUFFERQUEUE:
{
@@ -1949,7 +1949,7 @@
return SL_RESULT_PARAMETER_INVALID;
}
SLresult res = SL_RESULT_SUCCESS;
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_URIFD_TO_PCM_BUFFERQUEUE:
case AUDIOPLAYER_FROM_ADTS_ABQ_TO_PCM_BUFFERQUEUE:
{
@@ -1985,7 +1985,7 @@
return SL_RESULT_PARAMETER_INVALID;
}
SLresult res = SL_RESULT_SUCCESS;
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_URIFD_TO_PCM_BUFFERQUEUE:
case AUDIOPLAYER_FROM_ADTS_ABQ_TO_PCM_BUFFERQUEUE:
{
@@ -2021,7 +2021,7 @@
SLuint32 playState = ap->mPlay.mState;
AndroidObjectState objState = ap->mAndroidObjState;
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_PCM_BUFFERQUEUE:
switch (playState) {
case SL_PLAYSTATE_STOPPED:
@@ -2069,7 +2069,7 @@
void android_audioPlayer_usePlayEventMask(CAudioPlayer *ap) {
IPlay *pPlayItf = &ap->mPlay;
SLuint32 eventFlags = pPlayItf->mEventFlags;
- /*switch(ap->mAndroidObjType) {
+ /*switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_PCM_BUFFERQUEUE:*/
if (ap->mAPlayer != 0) {
@@ -2119,7 +2119,7 @@
//-----------------------------------------------------------------------------
SLresult android_audioPlayer_getDuration(IPlay *pPlayItf, SLmillisecond *pDurMsec) {
CAudioPlayer *ap = (CAudioPlayer *)pPlayItf->mThis;
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_URIFD: // intended fall-through
case AUDIOPLAYER_FROM_URIFD_TO_PCM_BUFFERQUEUE: {
@@ -2145,7 +2145,7 @@
//-----------------------------------------------------------------------------
void android_audioPlayer_getPosition(IPlay *pPlayItf, SLmillisecond *pPosMsec) {
CAudioPlayer *ap = (CAudioPlayer *)pPlayItf->mThis;
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_PCM_BUFFERQUEUE:
if ((ap->mSampleRateMilliHz == UNKNOWN_SAMPLERATE) || (ap->mAudioTrack == 0)) {
@@ -2180,7 +2180,7 @@
SLresult android_audioPlayer_seek(CAudioPlayer *ap, SLmillisecond posMsec) {
SLresult result = SL_RESULT_SUCCESS;
- switch(ap->mAndroidObjType) {
+ switch (ap->mAndroidObjType) {
case AUDIOPLAYER_FROM_PCM_BUFFERQUEUE: // intended fall-through
case AUDIOPLAYER_FROM_TS_ANDROIDBUFFERQUEUE:
diff --git a/src/android/AudioRecorder_to_android.cpp b/src/android/AudioRecorder_to_android.cpp
index af88815..f8c0040 100644
--- a/src/android/AudioRecorder_to_android.cpp
+++ b/src/android/AudioRecorder_to_android.cpp
@@ -222,7 +222,7 @@
void * callbackPContext = NULL;
- switch(event) {
+ switch (event) {
case android::AudioRecord::EVENT_MORE_DATA: {
slBufferQueueCallback callback = NULL;
android::AudioRecord::Buffer* pBuff = (android::AudioRecord::Buffer*)info;
diff --git a/src/android/MediaPlayer_to_android.cpp b/src/android/MediaPlayer_to_android.cpp
index 3622356..6d8ef56 100644
--- a/src/android/MediaPlayer_to_android.cpp
+++ b/src/android/MediaPlayer_to_android.cpp
@@ -51,7 +51,7 @@
u.i = event;
SL_LOGV("player_handleMediaPlayerEventNotifications(event='%c%c%c%c' (%d), data1=%d, data2=%d, "
"user=%p) from AVPlayer", u.c[3], u.c[2], u.c[1], u.c[0], event, data1, data2, user);
- switch(event) {
+ switch (event) {
case android::GenericPlayer::kEventPrepared: {
SL_LOGV("Received GenericPlayer::kEventPrepared for CMediaPlayer %p", mp);
@@ -315,7 +315,7 @@
//const SLuint32 sinkFormatType = *(SLuint32 *)pAudioSnk->pFormat;
// Source check
- switch(sourceLocatorType) {
+ switch (sourceLocatorType) {
case XA_DATALOCATOR_ANDROIDBUFFERQUEUE: {
switch (sourceFormatType) {
@@ -345,7 +345,7 @@
}// switch (locatorType)
// Audio sink check: only playback is supported here
- switch(audioSinkLocatorType) {
+ switch (audioSinkLocatorType) {
case XA_DATALOCATOR_OUTPUTMIX:
break;
@@ -373,7 +373,7 @@
const SLDataSink *pVideoSnk = &mp->mImageVideoSink.u.mSink;
XAuint32 sourceLocator = *(XAuint32 *)pDataSrc->pLocator;
- switch(sourceLocator) {
+ switch (sourceLocator) {
// FIXME support Android simple buffer queue as well
case XA_DATALOCATOR_ANDROIDBUFFERQUEUE:
mp->mAndroidObjType = AUDIOVIDEOPLAYER_FROM_TS_ANDROIDBUFFERQUEUE;
@@ -417,7 +417,7 @@
ap_params.sessionId = mp->mSessionId;
ap_params.streamType = mp->mStreamType;
- switch(mp->mAndroidObjType) {
+ switch (mp->mAndroidObjType) {
case AUDIOVIDEOPLAYER_FROM_TS_ANDROIDBUFFERQUEUE: {
mp->mAVPlayer = new android::StreamPlayer(&ap_params, true /*hasVideo*/,
&mp->mAndroidBufferQueue, mp->mCallbackProtector);
@@ -611,7 +611,7 @@
break;
case SL_PLAYSTATE_PAUSED: {
SL_LOGV("setting AVPlayer to SL_PLAYSTATE_PAUSED");
- switch(objState) {
+ switch (objState) {
case ANDROID_UNINITIALIZED:
*pObjState = ANDROID_PREPARING;
gp->prepare();
@@ -629,7 +629,7 @@
break;
case SL_PLAYSTATE_PLAYING: {
SL_LOGV("setting AVPlayer to SL_PLAYSTATE_PLAYING");
- switch(objState) {
+ switch (objState) {
case ANDROID_UNINITIALIZED:
*pObjState = ANDROID_PREPARING;
gp->prepare();
diff --git a/src/android/android_AudioSfDecoder.cpp b/src/android/android_AudioSfDecoder.cpp
index ec48c7f..0b68d0f 100644
--- a/src/android/android_AudioSfDecoder.cpp
+++ b/src/android/android_AudioSfDecoder.cpp
@@ -524,7 +524,7 @@
//-------------------------------- Handle return of decode
if (err != OK) {
bool continueDecoding = false;
- switch(err) {
+ switch (err) {
case ERROR_END_OF_STREAM:
if (0 < mDurationUsec) {
Mutex::Autolock _l(mTimeLock);
diff --git a/src/android/android_Effect.cpp b/src/android/android_Effect.cpp
index cf0dd42..ab3bbe3 100644
--- a/src/android/android_Effect.cpp
+++ b/src/android/android_Effect.cpp
@@ -697,7 +697,7 @@
android::AudioEffect::queryNumberEffects((uint32_t*)pNumSupportedAudioEffects);
SLresult result = SL_RESULT_SUCCESS;
- switch(status) {
+ switch (status) {
case android::NO_ERROR:
result = SL_RESULT_SUCCESS;
break;
@@ -731,7 +731,7 @@
SLresult result = SL_RESULT_SUCCESS;
if (android::NO_ERROR != status) {
- switch(status) {
+ switch (status) {
case android::PERMISSION_DENIED:
result = SL_RESULT_PERMISSION_DENIED;
break;
diff --git a/src/itf/IEngine.c b/src/itf/IEngine.c
index d1b05bf..8152755 100644
--- a/src/itf/IEngine.c
+++ b/src/itf/IEngine.c
@@ -60,7 +60,7 @@
// initialize ABQ buffer type
// assert below has been checked in android_audioPlayer_checkSourceSink
assert(SL_DATAFORMAT_MIME == ap->mDataSource.mFormat.mFormatType);
- switch(ap->mDataSource.mFormat.mMIME.containerType) {
+ switch (ap->mDataSource.mFormat.mMIME.containerType) {
case SL_CONTAINERTYPE_MPEG_TS:
ap->mAndroidBufferQueue.mBufferType = kAndroidBufferTypeMpeg2Ts;
break;
@@ -317,7 +317,7 @@
break;
}
#ifdef ANDROID
- switch(thiz->mDataSink.mLocator.mLocatorType) {
+ switch (thiz->mDataSink.mLocator.mLocatorType) {
case SL_DATALOCATOR_BUFFERQUEUE:
case SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE:
usesSimpleBufferQueue = true;
