diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-25 19:03:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:03:57 +0000 |
| commit | 243a42a7993761845e7042f1845de50aba2ffc7a (patch) | |
| tree | d6093bcad572c7eacfe59592e179e933cd1271b9 /cmds | |
| parent | b30866681475aff8fd23841dbadf1d39e0001e20 (diff) | |
| parent | 43ea037b4c61e332d7419ac069a62e314166fdd7 (diff) | |
| download | frameworks_base-243a42a7993761845e7042f1845de50aba2ffc7a.zip frameworks_base-243a42a7993761845e7042f1845de50aba2ffc7a.tar.gz frameworks_base-243a42a7993761845e7042f1845de50aba2ffc7a.tar.bz2 | |
am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"
* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
Fix class vs. struct mismatch
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/bootanimation/AudioPlayer.cpp | 2 | ||||
| -rw-r--r-- | cmds/bootanimation/AudioPlayer.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmds/bootanimation/AudioPlayer.cpp b/cmds/bootanimation/AudioPlayer.cpp index ec86afb..81fe5f8 100644 --- a/cmds/bootanimation/AudioPlayer.cpp +++ b/cmds/bootanimation/AudioPlayer.cpp @@ -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(); diff --git a/cmds/bootanimation/AudioPlayer.h b/cmds/bootanimation/AudioPlayer.h index 7e82a07..1def0ae 100644 --- a/cmds/bootanimation/AudioPlayer.h +++ b/cmds/bootanimation/AudioPlayer.h @@ -18,6 +18,7 @@ #define _BOOTANIMATION_AUDIOPLAYER_H #include <utils/Thread.h> +#include <utils/FileMap.h> namespace android { @@ -28,7 +29,7 @@ public: virtual ~AudioPlayer(); bool init(const char* config); - void playFile(struct FileMap* fileMap); + void playFile(FileMap* fileMap); private: virtual bool threadLoop(); @@ -39,7 +40,7 @@ private: int mPeriodSize; int mPeriodCount; - struct FileMap* mCurrentFile; + FileMap* mCurrentFile; }; } // namespace android |