| commit | 869f4d73b6c5886655223bf6fbb03c6af8b372df | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 03 05:48:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 03 05:48:05 2020 +0000 |
| tree | b39d50864a6c63b8c7e5fe285a160706b786bd71 | |
| parent | ba87a5444dcc6d03c75b8a89662ce8bb22dd030f [diff] | |
| parent | 06e190022525f2bc22ada355a8fe0db31982ec54 [diff] |
Merge "Move DataSourceUnwrapper to MidiIoWrapper class" am: e512cd3def am: 06e1900225 Change-Id: I8f13fe19a9881a8e1470d13cad3a914aade57047
diff --git a/media/libmedia/MidiIoWrapper.cpp b/media/libmedia/MidiIoWrapper.cpp index 6d46363..e71ea2c 100644 --- a/media/libmedia/MidiIoWrapper.cpp +++ b/media/libmedia/MidiIoWrapper.cpp
@@ -49,7 +49,7 @@ mDataSource = nullptr; } -class DataSourceUnwrapper { +class MidiIoWrapper::DataSourceUnwrapper { public: explicit DataSourceUnwrapper(CDataSource *csource) {
diff --git a/media/libmedia/include/media/MidiIoWrapper.h b/media/libmedia/include/media/MidiIoWrapper.h index b19d49e..d29949e 100644 --- a/media/libmedia/include/media/MidiIoWrapper.h +++ b/media/libmedia/include/media/MidiIoWrapper.h
@@ -24,7 +24,6 @@ namespace android { struct CDataSource; -class DataSourceUnwrapper; class MidiIoWrapper { public: @@ -43,6 +42,7 @@ int mFd; off64_t mBase; int64_t mLength; + class DataSourceUnwrapper; DataSourceUnwrapper *mDataSource; EAS_FILE mEasFile; };