diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-06-06 12:47:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 12:47:33 +0200 |
| commit | c0495d1d11028ecebe93419117b3e80062eb48af (patch) | |
| tree | 70071d5a82da8135b54c98d05ee5e2564138efa8 /Source/Android/jni/MainAndroid.cpp | |
| parent | 3c0bdd747314fc40eaebd1b1e76d0063d53edbee (diff) | |
| parent | b2af07a7b70c7c22d2c7b180d5846136d1fa1f77 (diff) | |
Merge pull request #5559 from JosJuice/discio-rename
DiscIO: Remove C/I/S prefixes from class names
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index e16e2bbecc..9d3dff94c4 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -192,7 +192,7 @@ static inline u32 GetPixel(u32* buffer, unsigned int x, unsigned int y) static bool LoadBanner(std::string filename, u32* Banner) { - std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(filename)); + std::unique_ptr<DiscIO::Volume> pVolume(DiscIO::CreateVolumeFromFilename(filename)); if (pVolume != nullptr) { @@ -230,7 +230,7 @@ static bool LoadBanner(std::string filename, u32* Banner) static int GetCountry(std::string filename) { - std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(filename)); + std::unique_ptr<DiscIO::Volume> pVolume(DiscIO::CreateVolumeFromFilename(filename)); if (pVolume != nullptr) { @@ -246,7 +246,7 @@ static int GetCountry(std::string filename) static int GetPlatform(std::string filename) { - std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(filename)); + std::unique_ptr<DiscIO::Volume> pVolume(DiscIO::CreateVolumeFromFilename(filename)); if (pVolume != nullptr) { @@ -272,7 +272,7 @@ static std::string GetTitle(std::string filename) __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting Title for file: %s", filename.c_str()); - std::unique_ptr<DiscIO::IVolume> pVolume(DiscIO::CreateVolumeFromFilename(filename)); + std::unique_ptr<DiscIO::Volume> pVolume(DiscIO::CreateVolumeFromFilename(filename)); if (pVolume != nullptr) { @@ -315,7 +315,7 @@ static std::string GetDescription(std::string filename) __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting Description for file: %s", filename.c_str()); - std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(filename)); + std::unique_ptr<DiscIO::Volume> volume(DiscIO::CreateVolumeFromFilename(filename)); if (volume != nullptr) { @@ -350,7 +350,7 @@ static std::string GetGameId(std::string filename) { __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting ID for file: %s", filename.c_str()); - std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(filename)); + std::unique_ptr<DiscIO::Volume> volume(DiscIO::CreateVolumeFromFilename(filename)); if (volume == nullptr) return std::string(); @@ -364,7 +364,7 @@ static std::string GetCompany(std::string filename) __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting Company for file: %s", filename.c_str()); - std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(filename)); + std::unique_ptr<DiscIO::Volume> volume(DiscIO::CreateVolumeFromFilename(filename)); if (volume == nullptr) return std::string(); @@ -377,7 +377,7 @@ static u64 GetFileSize(std::string filename) { __android_log_print(ANDROID_LOG_WARN, DOLPHIN_TAG, "Getting size of file: %s", filename.c_str()); - std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(filename)); + std::unique_ptr<DiscIO::Volume> volume(DiscIO::CreateVolumeFromFilename(filename)); if (volume == nullptr) return -1; |