commit 40d077fc65b6e5115b31c51b7a63e8d6bab9db78
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 05:57:22 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 05:57:22 2020 +0000
tree f8a918c26d392bef87ac8b241d16b0f51aabbab5
parent 3a229574b50a3535626d8278b2411849fd39963e
parent 869f4d73b6c5886655223bf6fbb03c6af8b372df

Merge "Move DataSourceUnwrapper to MidiIoWrapper class" am: e512cd3def am: 06e1900225 am: 869f4d73b6

Change-Id: Ifa10feda503d801556d6c0ac9f097415827708ab

media/libmedia/MidiIoWrapper.cpp

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) {

media/libmedia/include/media/MidiIoWrapper.h

diff --git a/media/libmedia/include/media/MidiIoWrapper.h b/media/libmedia/include/media/MidiIoWrapper.h
index 7beb619..0cdd4ad 100644
--- a/media/libmedia/include/media/MidiIoWrapper.h
+++ b/media/libmedia/include/media/MidiIoWrapper.h
@@ -22,7 +22,6 @@
 namespace android {
 
 struct CDataSource;
-class DataSourceUnwrapper;
 
 class MidiIoWrapper {
 public:
@@ -41,6 +40,7 @@
     int mFd;
     off64_t mBase;
     int64_t  mLength;
+    class DataSourceUnwrapper;
     DataSourceUnwrapper *mDataSource;
     EAS_FILE mEasFile;
 };