diff options
Diffstat (limited to 'cmds/bootanimation/AudioPlayer.cpp')
| -rw-r--r-- | cmds/bootanimation/AudioPlayer.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cmds/bootanimation/AudioPlayer.cpp b/cmds/bootanimation/AudioPlayer.cpp index 471b77f..2932130 100644 --- a/cmds/bootanimation/AudioPlayer.cpp +++ b/cmds/bootanimation/AudioPlayer.cpp @@ -98,16 +98,16 @@ static bool setMixerValue(struct mixer* mixer, const char* name, const char* val ALOGE("mixer_ctl_set_value failed for %s %d", name, intValue); } } else { - ALOGE("Could not parse %s as int for %d", intValue, name); + ALOGE("Could not parse %s as int for %s", values, name); } break; case MIXER_CTL_TYPE_ENUM: if (sscanf(values, "%s", stringValue) == 1) { if (mixer_ctl_set_enum_by_string(ctl, stringValue) != 0) { - ALOGE("mixer_ctl_set_enum_by_string failed for %s %%s", name, stringValue); + ALOGE("mixer_ctl_set_enum_by_string failed for %s %s", name, stringValue); } } else { - ALOGE("Could not parse %s as enum for %d", stringValue, name); + ALOGE("Could not parse %s as enum for %s", values, name); } break; default: @@ -193,7 +193,7 @@ bool AudioPlayer::init(const char* config) return false; } -void AudioPlayer::playFile(struct FileMap* fileMap) { +void AudioPlayer::playFile(FileMap* fileMap) { // stop any currently playing sound requestExitAndWait(); @@ -207,7 +207,6 @@ bool AudioPlayer::threadLoop() struct pcm *pcm = NULL; bool moreChunks = true; const struct chunk_fmt* chunkFmt = NULL; - void* buffer = NULL; int bufferSize; const uint8_t* wavData; size_t wavLength; @@ -306,7 +305,7 @@ bool AudioPlayer::threadLoop() exit: if (pcm) pcm_close(pcm); - mCurrentFile->release(); + delete mCurrentFile; mCurrentFile = NULL; return false; } |
