Merge pull request #5 from Iamgoofball/patch-1

Fixes opus, adds opus and mp3 support to ini SFX, thanks Longbyte

4 files changed, 32 insertions, 8 deletions

diff --git a/Attorney_Online_remake.pro b/Attorney_Online_remake.pro
index 46d65ff7..24ecf7d6 100644
--- a/Attorney_Online_remake.pro
+++ b/Attorney_Online_remake.pro
@@ -88,7 +88,7 @@ HEADERS  += lobby.h \
 #    in the same way as BASS. Discord RPC uses CMake, which does not play nicely with
 #    QMake, so this step must be manual.
 unix:LIBS += -L$$PWD -lbass -ldiscord-rpc
-win32:LIBS += -L$$PWD "$$PWD/bass.dll" -ldiscord-rpc #"$$PWD/discord-rpc.dll"
+win32:LIBS += -L$$PWD "$$PWD/bass.dll" -L$$PWD "$$PWD/discord-rpc.dll"
 android:LIBS += -L$$PWD\android\libs\armeabi-v7a\ -lbass
 
 CONFIG += c++11
diff --git a/aoapplication.h b/aoapplication.h
index 53968747..b9d3fd10 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -169,6 +169,9 @@ public:
   //Returns the sfx with p_identifier from sounds.ini in the current theme path
   QString get_sfx(QString p_identifier);
 
+  //Figure out if we can opus this or if we should fall back to wav
+  QString get_sfx_suffix(QString sound_to_check);
+
   //Returns the value of p_search_line within target_tag and terminator_tag
   QString read_char_ini(QString p_char, QString p_search_line, QString target_tag, QString terminator_tag);
 
@@ -226,7 +229,7 @@ public:
 private:
   const int RELEASE = 2;
   const int MAJOR_VERSION = 5;
-  const int MINOR_VERSION = 1;
+  const int MINOR_VERSION = 2;
 
   QString current_theme = "default";
 
diff --git a/courtroom.cpp b/courtroom.cpp
index 352a3da5..1ccae30b 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -6,7 +6,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
 
   //initializing sound device
   BASS_Init(-1, 48000, BASS_DEVICE_LATENCY, 0, NULL);
-  BASS_PluginLoad("bassopus.dll", BASS_UNICODE);
+  BASS_PluginLoad(L"bassopus.dll", BASS_UNICODE);
 
   keepalive_timer = new QTimer(this);
   keepalive_timer->start(60000);
@@ -1377,7 +1377,7 @@ void Courtroom::play_sfx()
   if (sfx_name == "1")
     return;
 
-  sfx_player->play(sfx_name + ".wav");
+  sfx_player->play(ao_app->get_sfx_suffix(sfx_name));
 }
 
 void Courtroom::set_scene()
@@ -1488,12 +1488,13 @@ void Courtroom::set_text_color()
     ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
                                  "color: yellow");
     break;
-  default:
-    qDebug() << "W: undefined text color: " << m_chatmessage[TEXT_COLOR];
+
   case WHITE:
     ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
                                  "color: white");
-
+    break;
+  default:
+    qDebug() << "W: undefined text color: " << m_chatmessage[TEXT_COLOR];
   }
 }
 
diff --git a/text_file_functions.cpp b/text_file_functions.cpp
index 1aebc35e..5b057a4b 100644
--- a/text_file_functions.cpp
+++ b/text_file_functions.cpp
@@ -340,6 +340,26 @@ QString AOApplication::get_sfx(QString p_identifier)
   return return_sfx;
 }
 
+QString AOApplication::get_sfx_suffix(QString sound_to_check)
+{
+    QString wav_check = get_sounds_path() + sound_to_check + ".wav";
+    QString mp3_check = get_sounds_path() + sound_to_check + ".mp3";
+    QString opus_check = get_sounds_path() + sound_to_check + ".opus";
+    if(file_exists(opus_check))
+    {
+        return sound_to_check + ".opus";
+    }
+    if(file_exists(mp3_check))
+    {
+        return sound_to_check + ".mp3";
+    }
+    if(file_exists(wav_check))
+    {
+        return sound_to_check + ".wav";
+    }
+    return sound_to_check + ".wav";
+}
+
 //returns whatever is to the right of "search_line =" within target_tag and terminator_tag, trimmed
 //returns the empty string if the search line couldnt be found
 QString AOApplication::read_char_ini(QString p_char, QString p_search_line, QString target_tag, QString terminator_tag)
@@ -586,4 +606,4 @@ bool AOApplication::ic_scroll_down_enabled()
 {
   QString f_result = read_config("ic_scroll_down");
   return f_result.startsWith("true");
-}
\ No newline at end of file
+}