diff options
Diffstat (limited to 'media/libmediaplayerservice/MidiFile.cpp')
-rw-r--r-- | media/libmediaplayerservice/MidiFile.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/media/libmediaplayerservice/MidiFile.cpp b/media/libmediaplayerservice/MidiFile.cpp index 4946956..7cb8c29 100644 --- a/media/libmediaplayerservice/MidiFile.cpp +++ b/media/libmediaplayerservice/MidiFile.cpp @@ -69,13 +69,13 @@ MidiFile::MidiFile() : if (pLibConfig == NULL) pLibConfig = EAS_Config(); if ((pLibConfig == NULL) || (LIB_VERSION != pLibConfig->libVersion)) { - LOGE("EAS library/header mismatch"); + ALOGE("EAS library/header mismatch"); goto Failed; } // initialize EAS library if (EAS_Init(&mEasData) != EAS_SUCCESS) { - LOGE("EAS_Init failed"); + ALOGE("EAS_Init failed"); goto Failed; } @@ -134,7 +134,7 @@ status_t MidiFile::setDataSource( } if (result != EAS_SUCCESS) { - LOGE("EAS_OpenFile failed: [%d]", (int)result); + ALOGE("EAS_OpenFile failed: [%d]", (int)result); mState = EAS_STATE_ERROR; return ERROR_OPEN_FAILED; } @@ -162,7 +162,7 @@ status_t MidiFile::setDataSource(int fd, int64_t offset, int64_t length) updateState(); if (result != EAS_SUCCESS) { - LOGE("EAS_OpenFile failed: [%d]", (int)result); + ALOGE("EAS_OpenFile failed: [%d]", (int)result); mState = EAS_STATE_ERROR; return ERROR_OPEN_FAILED; } @@ -181,7 +181,7 @@ status_t MidiFile::prepare() } EAS_RESULT result; if ((result = EAS_Prepare(mEasData, mEasHandle)) != EAS_SUCCESS) { - LOGE("EAS_Prepare failed: [%ld]", result); + ALOGE("EAS_Prepare failed: [%ld]", result); return ERROR_EAS_FAILURE; } updateState(); @@ -237,7 +237,7 @@ status_t MidiFile::stop() if (!mPaused && (mState != EAS_STATE_STOPPED)) { EAS_RESULT result = EAS_Pause(mEasData, mEasHandle); if (result != EAS_SUCCESS) { - LOGE("EAS_Pause returned error %ld", result); + ALOGE("EAS_Pause returned error %ld", result); return ERROR_EAS_FAILURE; } } @@ -258,7 +258,7 @@ status_t MidiFile::seekTo(int position) if ((result = EAS_Locate(mEasData, mEasHandle, position, false)) != EAS_SUCCESS) { - LOGE("EAS_Locate returned %ld", result); + ALOGE("EAS_Locate returned %ld", result); return ERROR_EAS_FAILURE; } EAS_GetLocation(mEasData, mEasHandle, &mPlayTime); @@ -293,11 +293,11 @@ status_t MidiFile::getCurrentPosition(int* position) { ALOGV("MidiFile::getCurrentPosition"); if (!mEasHandle) { - LOGE("getCurrentPosition(): file not open"); + ALOGE("getCurrentPosition(): file not open"); return ERROR_NOT_OPEN; } if (mPlayTime < 0) { - LOGE("getCurrentPosition(): mPlayTime = %ld", mPlayTime); + ALOGE("getCurrentPosition(): mPlayTime = %ld", mPlayTime); return ERROR_EAS_FAILURE; } *position = mPlayTime; @@ -422,7 +422,7 @@ status_t MidiFile::setLooping(int loop) status_t MidiFile::createOutputTrack() { if (mAudioSink->open(pLibConfig->sampleRate, pLibConfig->numChannels, AUDIO_FORMAT_PCM_16_BIT, 2) != NO_ERROR) { - LOGE("mAudioSink open failed"); + ALOGE("mAudioSink open failed"); return ERROR_OPEN_FAILED; } return NO_ERROR; @@ -439,7 +439,7 @@ int MidiFile::render() { // allocate render buffer mAudioBuffer = new EAS_PCM[pLibConfig->mixBufferSize * pLibConfig->numChannels * NUM_BUFFERS]; if (!mAudioBuffer) { - LOGE("mAudioBuffer allocate failed"); + ALOGE("mAudioBuffer allocate failed"); goto threadExit; } @@ -473,7 +473,7 @@ int MidiFile::render() { for (int i = 0; i < NUM_BUFFERS; i++) { result = EAS_Render(mEasData, p, pLibConfig->mixBufferSize, &count); if (result != EAS_SUCCESS) { - LOGE("EAS_Render returned %ld", result); + ALOGE("EAS_Render returned %ld", result); } p += count * pLibConfig->numChannels; num_output += count * pLibConfig->numChannels * sizeof(EAS_PCM); @@ -495,7 +495,7 @@ int MidiFile::render() { // Write data to the audio hardware // ALOGV("MidiFile::render - writing to audio output"); if ((temp = mAudioSink->write(mAudioBuffer, num_output)) < 0) { - LOGE("Error in writing:%d",temp); + ALOGE("Error in writing:%d",temp); return temp; } @@ -519,7 +519,7 @@ int MidiFile::render() { } case EAS_STATE_ERROR: { - LOGE("MidiFile::render - error"); + ALOGE("MidiFile::render - error"); sendEvent(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN); break; } |