drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"

Browse Source 
* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
  Fix class vs. struct mismatch
This commit is contained in:
Chih-hung Hsieh
2014-11-25 19:03:57 +00:00
committed by Android Git Automerger
parent b308666814 43ea037b4c
commit 243a42a799
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/bootanimation/AudioPlayer.cpp
View File

@ -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();

5
cmds/bootanimation/AudioPlayer.h
View File

@ -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

2
media/jni/android_media_MediaExtractor.h
View File

@ -30,7 +30,7 @@
namespace android {
struct IMediaHTTPService;
struct MetaData;
class MetaData;
struct NuMediaExtractor;
struct JMediaExtractor : public RefBase {

4
media/jni/android_media_MediaHTTPConnection.h
View File

@ -24,8 +24,8 @@
namespace android {
struct IMemory;
struct MemoryDealer;
class IMemory;
class MemoryDealer;
struct JMediaHTTPConnection : public RefBase {
enum {