Full revert to tag 2.6.2

Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).

Changes dropped include:
 - Witness needed
 - Shake
 - Frame SFX
 - Multiple custom objections
 - Multithreaded thumbnail generation
 - Looping
 - Various translation additions
 - "Mirror IC"
 - Color in IC log
 - An invocation of clang-format

Next time, work together and split your big fork into independently
testable feature branches.

1 files changed, 22 insertions, 54 deletions

diff --git a/src/path_functions.cpp b/src/path_functions.cpp
index 358f146b..c51cfde3 100644
--- a/src/path_functions.cpp
+++ b/src/path_functions.cpp
@@ -3,18 +3,18 @@
 #include "file_functions.h"
 
 #include <QDir>
-#include <QRegExp>
 #include <QStandardPaths>
+#include <QRegExp>
 
 #ifdef BASE_OVERRIDE
 #include "base_override.h"
 #endif
 
-// this is a quite broad generalization
-// the most common OSes(mac and windows) are _usually_ case insensitive
-// however, there do exist mac installations with case sensitive filesystems
-// in that case, define CASE_SENSITIVE_FILESYSTEM and compile on a mac
-#if (defined(LINUX) || defined(__linux__))
+//this is a quite broad generalization
+//the most common OSes(mac and windows) are _usually_ case insensitive
+//however, there do exist mac installations with case sensitive filesystems
+//in that case, define CASE_SENSITIVE_FILESYSTEM and compile on a mac
+#if (defined (LINUX) || defined (__linux__))
 #define CASE_SENSITIVE_FILESYSTEM
 #endif
 
@@ -23,15 +23,13 @@ QString AOApplication::get_base_path()
   QString base_path = "";
 #ifdef ANDROID
   QString sdcard_storage = getenv("SECONDARY_STORAGE");
-  if (dir_exists(sdcard_storage + "/AO2/")) {
+  if (dir_exists(sdcard_storage + "/AO2/")){
     base_path = sdcard_storage + "/AO2/";
   }
   else {
     QString external_storage = getenv("EXTERNAL_STORAGE");
     base_path = external_storage + "/AO2/";
   }
-#elif defined __APPLE__
-  base_path = applicationDirPath() + "/../../../base/";
 #else
   base_path = applicationDirPath() + "/base/";
 #endif
@@ -39,7 +37,10 @@ QString AOApplication::get_base_path()
   return base_path;
 }
 
-QString AOApplication::get_data_path() { return get_base_path() + "data/"; }
+QString AOApplication::get_data_path()
+{
+  return get_base_path() + "data/";
+}
 
 QString AOApplication::get_default_theme_path(QString p_file)
 {
@@ -93,46 +94,17 @@ QString AOApplication::get_sounds_path(QString p_file)
 
 QString AOApplication::get_music_path(QString p_song)
 {
-  QString withending_check = get_base_path() + "sounds/music/" + p_song;
-  QString mp3_check = get_base_path() + "sounds/music/" + p_song + ".mp3";
-  QString opus_check = get_base_path() + "sounds/music/" + p_song + ".opus";
-  if (p_song.startsWith("http")) {
-      //it's an URL
-      return p_song;
-  }
-  else if (file_exists(opus_check)) {
-#ifndef CASE_SENSITIVE_FILESYSTEM
-    return opus_check;
-#else
-    return get_case_sensitive_path(opus_check);
-#endif
-  }
-  else if (file_exists(mp3_check)) {
-#ifndef CASE_SENSITIVE_FILESYSTEM
-    return mp3_check;
-#else
-    return get_case_sensitive_path(mp3_check);
-#endif
-  }
-  else if (file_exists(withending_check)) {
-#ifndef CASE_SENSITIVE_FILESYSTEM
-    return withending_check;
-#else
-    return get_case_sensitive_path(withending_check);
-#endif
-  }
+  QString path = get_base_path() + "sounds/music/" + p_song;
 #ifndef CASE_SENSITIVE_FILESYSTEM
-  return get_base_path() + "sounds/music/" + p_song + ".wav";
+  return path;
 #else
-  return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song +
-                                 ".wav");
+  return get_case_sensitive_path(path);
 #endif
 }
 
 QString AOApplication::get_background_path(QString p_file)
 {
-  QString path = get_base_path() + "background/" +
-                 w_courtroom->get_current_background() + "/" + p_file;
+  QString path = get_base_path() + "background/" + w_courtroom->get_current_background() + "/" + p_file;
   if (courtroom_constructed) {
 #ifndef CASE_SENSITIVE_FILESYSTEM
     return path;
@@ -163,25 +135,21 @@ QString AOApplication::get_evidence_path(QString p_file)
 #endif
 }
 
-QString AOApplication::get_case_sensitive_path(QString p_file)
-{
-  // first, check to see if it's actually there (also serves as base case for
-  // recursion)
-  if (exists(p_file))
-    return p_file;
+QString AOApplication::get_case_sensitive_path(QString p_file) {
+  //first, check to see if it's actually there (also serves as base case for recursion)
+  if (exists(p_file)) return p_file;
 
   QFileInfo file(p_file);
 
   QString file_basename = file.fileName();
   QString file_parent_dir = get_case_sensitive_path(file.absolutePath());
 
-  // second, does it exist in the new parent dir?
+  //second, does it exist in the new parent dir?
   if (exists(file_parent_dir + "/" + file_basename))
     return file_parent_dir + "/" + file_basename;
 
-  // last resort, dirlist parent dir and find case insensitive match
-  QRegExp file_rx =
-      QRegExp(file_basename, Qt::CaseInsensitive, QRegExp::FixedString);
+  //last resort, dirlist parent dir and find case insensitive match
+  QRegExp file_rx = QRegExp(file_basename, Qt::CaseInsensitive, QRegExp::FixedString);
   QStringList files = QDir(file_parent_dir).entryList();
 
   int result = files.indexOf(file_rx);
@@ -189,6 +157,6 @@ QString AOApplication::get_case_sensitive_path(QString p_file)
   if (result != -1)
     return file_parent_dir + "/" + files.at(result);
 
-  // if nothing is found, let the caller handle the missing file
+  //if nothing is found, let the caller handle the missing file
   return file_parent_dir + "/" + file_basename;
 }