Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 243a42a7 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Android Git Automerger
Browse files

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

* commit '43ea037b':
  Fix class vs. struct mismatch
parents b3086668 43ea037b

cmds/bootanimation/AudioPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();

cmds/bootanimation/AudioPlayer.h

+3 −2
Original line number Diff line number Diff line
@@ -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

media/jni/android_media_MediaExtractor.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
namespace android {



struct IMediaHTTPService;

struct MetaData;

class MetaData;

struct NuMediaExtractor;



struct JMediaExtractor : public RefBase {

media/jni/android_media_MediaHTTPConnection.h

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 


namespace android {



struct IMemory;

struct MemoryDealer;

class IMemory;

class MemoryDealer;



struct JMediaHTTPConnection : public RefBase {

    enum {