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

Commit 869f4d73 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Move DataSourceUnwrapper to MidiIoWrapper class" am: e512cd3d am: 06e19002 

Change-Id: I8f13fe19a9881a8e1470d13cad3a914aade57047
parents ba87a544 06e19002

media/libmedia/MidiIoWrapper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ MidiIoWrapper::MidiIoWrapper(int fd, off64_t offset, int64_t size) { 
    mDataSource = nullptr;

}



class DataSourceUnwrapper {

class MidiIoWrapper::DataSourceUnwrapper {



public:

    explicit DataSourceUnwrapper(CDataSource *csource) {

media/libmedia/include/media/MidiIoWrapper.h

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



struct CDataSource;

class DataSourceUnwrapper;



class MidiIoWrapper {

public:
@@ -43,6 +42,7 @@ private: 
    int mFd;

    off64_t mBase;

    int64_t  mLength;

    class DataSourceUnwrapper;

    DataSourceUnwrapper *mDataSource;

    EAS_FILE mEasFile;

};