summaryrefslogtreecommitdiff
path: root/Source/Android/jni/MainAndroid.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2016-06-25 18:07:10 +0200
committerJosJuice <josjuice@gmail.com>2016-06-25 18:07:10 +0200
commit1878605d77d38861307027ae5bcd6ca131c8266e (patch)
treee3c3fba5f61c0bf3316a257d7d791849a7fd45de /Source/Android/jni/MainAndroid.cpp
parent64cf74abb4158ffabe8b5dce3c1a4d42a82b054f (diff)
Undo some comment formatting changes from b5104a7
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
-rw-r--r--Source/Android/jni/MainAndroid.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index 4dab66a701..4862e79080 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -274,10 +274,8 @@ static std::string GetTitle(std::string filename)
titles = pVolume->GetShortNames();
/*
- bool is_wii_title = pVolume->GetVolumeType() !=
- DiscIO::IVolume::GAMECUBE_DISC;
- DiscIO::IVolume::ELanguage language =
- SConfig::GetInstance().GetCurrentLanguage(is_wii_title);
+ bool is_wii_title = pVolume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC;
+ DiscIO::IVolume::ELanguage language = SConfig::GetInstance().GetCurrentLanguage(is_wii_title);
auto it = titles.find(language);
if (it != end)
@@ -285,8 +283,7 @@ static std::string GetTitle(std::string filename)
auto end = titles.end();
- // English tends to be a good fallback when the requested language isn't
- // available
+ // English tends to be a good fallback when the requested language isn't available
// if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH) {
auto it = titles.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH);
if (it != end)
@@ -318,10 +315,8 @@ static std::string GetDescription(std::string filename)
std::map<DiscIO::IVolume::ELanguage, std::string> descriptions = volume->GetDescriptions();
/*
- bool is_wii_title = pVolume->GetVolumeType() !=
- DiscIO::IVolume::GAMECUBE_DISC;
- DiscIO::IVolume::ELanguage language =
- SConfig::GetInstance().GetCurrentLanguage(is_wii_title);
+ bool is_wii_title = pVolume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC;
+ DiscIO::IVolume::ELanguage language = SConfig::GetInstance().GetCurrentLanguage(is_wii_title);
auto it = descriptions.find(language);
if (it != end)
@@ -329,8 +324,7 @@ static std::string GetDescription(std::string filename)
auto end = descriptions.end();
- // English tends to be a good fallback when the requested language isn't
- // available
+ // English tends to be a good fallback when the requested language isn't available
// if (language != DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH) {
auto it = descriptions.find(DiscIO::IVolume::ELanguage::LANGUAGE_ENGLISH);
if (it != end)