Merge pull request #246 from AttorneyOnline/2.8

Merges 2.8.5, which is a patch release for 2.8 with no substantially new features.

This commit is release-ready.

Author: oldmud0

.gitignore

@@ -22,6 +22,7 @@ base/characters
 base/sounds
 base/callwords.ini
 base/config.ini
+base/serverlist.txt
 
 .qmake.stash
 

.gitlab-ci.yml

@@ -5,8 +5,6 @@ stages:
 
 cache:
   key: ${CI_COMMIT_REF_SLUG}
-  paths:
-    - lib/
 
 variables:
   DEBIAN_FRONTEND: noninteractive
@@ -15,7 +13,7 @@ before_script:
   - echo Current working directory is $(pwd)
 
 build linux x86_64:
-  image: ubuntu
+  image: ubuntu:18.04
   stage: build
   tags:
     - docker
@@ -34,15 +32,15 @@ build linux x86_64:
     - clang --version
 
     # Extract BASS
-    #- mkdir bass
-    #- cd bass
-    #- curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
-    #- unzip bass.zip
-    #- cp x64/libbass.so ../lib
-    #- curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
-    #- unzip bassopus.zip
-    #- cp x64/libbassopus.so ../lib
-    #- cd ..
+    - mkdir bass
+    - cd bass
+    - curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
+    - unzip bass.zip
+    - cp x64/libbass.so ../lib
+    - curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
+    - unzip bassopus.zip
+    - cp x64/libbassopus.so ../lib
+    - cd ..
 
     # Extract Discord RPC
     - mkdir discord-rpc
@@ -53,21 +51,32 @@ build linux x86_64:
     - cd ..
 
     # Extract QtApng
-    - mkdir qtapng
-    - cd qtapng
-    - curl -L https://github.com/Skycoder42/QtApng/releases/download/1.1.0-5/build_gcc_64_5.12.0.tar.xz -o apng.tar.xz
-    - tar -xvf apng.tar.xz
-    - cp gcc_64/plugins/imageformats/libqapng.so ../lib
+    #- mkdir qtapng
+    #- cd qtapng
+    #- curl -L https://github.com/Skycoder42/QtApng/releases/download/1.1.0-5/build_gcc_64_5.12.0.tar.xz -o apng.tar.xz
+    #- tar -xvf apng.tar.xz
+    #- cp gcc_64/plugins/imageformats/libqapng.so ../lib
+    #- cd ..
+
+    # Build QtApng
+    - git clone https://github.com/Skycoder42/QtApng
+    - cd QtApng
+    - qmake -spec linux-clang
+    # Don't make examples - they're not compatible with Qt 5.9
+    - make -j4 sub-src
+    #- make sub-src-install_subtargets
+    - cp plugins/imageformats/libqapng.so ../lib
     - cd ..
 
     # Build
-    - qmake -spec linux-clang "DEFINES += DISCORD QTAUDIO"
+    - qmake -spec linux-clang "DEFINES += DISCORD"
     - make -j4
 
     # Post-processing
     - upx --lzma -9 --force bin/Attorney_Online
   artifacts:
     paths:
+      - lib/
       - bin/
 
 build windows i686:
@@ -109,19 +118,21 @@ build windows i686:
     - ls lib
 
     # Build
-    - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake "DEFINES += DISCORD BASSAUDIO"
+    - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake "DEFINES += DISCORD"
     - make -j4
 
     # Post-processing
     - upx --lzma -9 --force bin/Attorney_Online.exe
   artifacts:
     paths:
+      - lib/
       - bin/
 
 # Base folder
 .deploy_base: &deploy_base |
-    mkdir base
     cp -a ../base/ base/
+    rm -rf base/themes/_Unadapted/
+    rm base/themes/.gitattributes base/themes/.git
 
 # Miscellaneous files
 .deploy_misc: &deploy_misc |

Attorney_Online.pro

@@ -3,7 +3,7 @@ QT += core gui widgets network
 TARGET = Attorney_Online
 TEMPLATE = app
 
-VERSION = 2.8.4.0
+VERSION = 2.8.5.0
 
 INCLUDEPATH += $$PWD/include
 DESTDIR = $$PWD/bin
@@ -22,35 +22,15 @@ contains(DEFINES, DISCORD) {
   LIBS += -ldiscord-rpc
 }
 
-# Uncomment to enable the BASS audio engine
-# (Recommended for Windows)
-# DEFINES += BASSAUDIO
-
-contains(DEFINES, BASSAUDIO) {
-  LIBS += -lbass
-  LIBS += -lbassopus
-}
-
-# Uncomment to enable the Qt audio engine
-# (Recommended for non-Windows platforms)
-# DEFINES += QTAUDIO
-
-contains(DEFINES, QTAUDIO) {
-  QT += multimedia
-}
-
-AUDIO_DEFINES = $$find(DEFINES, BASSAUDIO) $$find(DEFINES, QTAUDIO)
-count(AUDIO_DEFINES, 0) {
-  warning("No audio system selected. Your build will not have audio.")
-}
-
-count(AUDIO_DEFINES, 2) {
-  error("More than one audio system selected.")
-}
+# As of 2.8.5, BASS and BASSOPUS are required for all platforms. Qt Multimedia
+# is no longer an option due to outdated code and lack of versatility.
+# Download at un4seen.com and place the DLLs in the "lib" and "bin" folders.
+DEFINES += BASSAUDIO
+LIBS += -lbass
+LIBS += -lbassopus
 
 macx:LIBS += -framework CoreFoundation -framework Foundation -framework CoreServices
 
-
 CONFIG += c++14
 
 RESOURCES += resources.qrc

base/serverlist.txt base/serverlist.sample.txtbase/serverlist.txt renamed to base/serverlist.sample.txt

@@ -5,6 +5,9 @@
 #include "datatypes.h"
 #include "discord_rich_presence.h"
 
+#include "bass.h"
+#include "bassopus.h"
+
 #include <QApplication>
 #include <QFile>
 #include <QSettings>
@@ -23,9 +26,6 @@
 #include <QScreen>
 #include <QStringList>
 #include <QTextStream>
-#ifdef QTAUDIO
-#include <QAudioDeviceInfo>
-#endif
 
 class NetworkManager;
 class Lobby;
@@ -202,7 +202,8 @@ class AOApplication : public QApplication {
 
   // Returns the value of whether custom chatboxes should be a thing.
   // from the config.ini.
-  // I am increasingly maddened by the lack of dynamic auto-generation system for settings.
+  // I am increasingly maddened by the lack of dynamic auto-generation system
+  // for settings.
   bool is_customchat_enabled();
 
   // Returns the value of the maximum amount of lines the IC chatlog
@@ -213,14 +214,20 @@ class AOApplication : public QApplication {
   // or downwards (vanilla behaviour).
   bool get_log_goes_downwards();
 
+  // Returns whether the log should separate name from text via newline or :
+  bool get_log_newline();
+
+  // Get spacing between IC log entries.
+  int get_log_margin();
+
+  // Returns whether the log should have a timestamp.
+  bool get_log_timestamp();
+
   // Returns the username the user may have set in config.ini.
   QString get_default_username();
 
   // Returns the audio device used for the client.
   QString get_audio_output_device();
-#ifdef QTAUDIO
-  QAudioDeviceInfo QtAudioDevice;
-#endif
 
   // Returns whether the user would like to have custom shownames on by default.
   bool get_showname_enabled_by_default();
@@ -433,10 +440,16 @@ class AOApplication : public QApplication {
   // The file name of the log file in base/logs.
   QString log_filename;
 
+  void initBASS();
+  static void load_bass_opus_plugin();
+  static void CALLBACK BASSreset(HSTREAM handle, DWORD channel, DWORD data,
+                                 void *user);
+  static void doBASSreset();
+
 private:
   const int RELEASE = 2;
   const int MAJOR_VERSION = 8;
-  const int MINOR_VERSION = 4;
+  const int MINOR_VERSION = 5;
 
   QString current_theme = "default";
 

base/themes

@@ -1,12 +1,8 @@
 #ifndef AOBLIPPLAYER_H
 #define AOBLIPPLAYER_H
 
-#if defined(BASSAUDIO)
 #include "bass.h"
 #include "bassopus.h"
-#elif defined(QTAUDIO)
-#include <QSoundEffect>
-#endif
 
 #include "aoapplication.h"
 
@@ -35,11 +31,7 @@ class AOBlipPlayer {
 
   void set_volume_internal(qreal p_volume);
 
-#if defined(BASSAUDIO)
   HSTREAM m_stream_list[5];
-#elif defined(QTAUDIO)
-  QSoundEffect m_blips;
-#endif
 };
 
 #endif // AOBLIPPLAYER_H

include/aoapplication.h

@@ -2,12 +2,8 @@
 #define AOMUSICPLAYER_H
 #include "file_functions.h"
 
-#if defined(BASSAUDIO)
 #include "bass.h"
 #include "bassopus.h"
-#elif defined(QTAUDIO)
-#include <QMediaPlayer>
-#endif
 
 #include "aoapplication.h"
 
@@ -44,12 +40,8 @@ public slots:
   // Channel 1 = ambience
   // Channel 2 = extra
   // Channel 3 = extra
-  #if defined(BASSAUDIO)
   HSTREAM m_stream_list[4];
   HSYNC loop_sync[4];
-  #elif defined(QTAUDIO)
-  QMediaPlayer m_stream_list[4];
-  #endif
 };
 
 #endif // AOMUSICPLAYER_H

include/aoblipplayer.h

@@ -46,6 +46,12 @@ class AOOptionsDialog : public QDialog {
   QCheckBox *ui_downwards_cb;
   QLabel *ui_length_lbl;
   QSpinBox *ui_length_spinbox;
+  QLabel *ui_log_newline_lbl;
+  QCheckBox *ui_log_newline_cb;
+  QLabel *ui_log_margin_lbl;
+  QSpinBox *ui_log_margin_spinbox;
+  QLabel *ui_log_timestamp_lbl;
+  QCheckBox *ui_log_timestamp_cb;
   QFrame *ui_log_names_divider;
   QLineEdit *ui_username_textbox;
   QLabel *ui_username_lbl;

include/aomusicplayer.h

@@ -1,12 +1,8 @@
 #ifndef AOSFXPLAYER_H
 #define AOSFXPLAYER_H
 
-#if defined(BASSAUDIO)
 #include "bass.h"
 #include "bassopus.h"
-#elif defined(QTAUDIO)
-#include <QSoundEffect>
-#endif
 
 #include "aoapplication.h"
 
@@ -37,11 +33,7 @@ class AOSfxPlayer {
 
   const int m_channelmax = 5;
 
-#if defined(BASSAUDIO)
   HSTREAM m_stream_list[5];
-#elif defined(QTAUDIO)
-  QSoundEffect m_stream_list[5];
-#endif
 };
 
 #endif // AOSFXPLAYER_H