Midi music

.github/workflows/build.yml

@@ -38,6 +38,11 @@ jobs:
         unzip bass.zip
         cp ./c/x64/bass.lib ./lib
 
+        # BASS MIDI
+        curl http://www.un4seen.com/files/bassmidi24.zip -o bassmidi.zip
+        unzip bassmidi.zip
+        cp ./c/x64/bassmidi.lib ./lib
+
         # BASS Opus
         curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
         unzip bassopus.zip
@@ -77,6 +82,7 @@ jobs:
         cp ../../msvc2017_64/plugins/imageformats/qapng.dll ./imageformats/
         cp ../../discord-rpc/win64-dynamic/bin/discord-rpc.dll .
         cp ../../x64/bass.dll .
+        cp ../../x64/bassmidi.dll .
         cp ../../x64/bassopus.dll .
 
     - name: Upload Artifact

.github/workflows/test.yml

@@ -31,14 +31,17 @@ jobs:
       run: |
         # Download
         curl http://www.un4seen.com/files/bass24-linux.zip -o bass_linux.zip
+        curl http://www.un4seen.com/files/bassmidi24-linux.zip -o bassmidi_linux.zip
         curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus_linux.zip
         curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc_linux.zip
         # Extract
         unzip bass_linux.zip
+        unzip bassmidi_linux.zip
         unzip bassopus_linux.zip
         unzip discord_rpc_linux.zip
         # Copy
         cp x64/libbass.so lib
+        cp x64/libbassmidi.so lib
         cp x64/libbassopus.so lib
         cp discord-rpc/linux-dynamic/lib/libdiscord-rpc.so lib
 

.gitlab-ci.yml

@@ -35,18 +35,21 @@ build linux x86_64:
     - mkdir bass
     - cd bass
     - curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
-    - unzip bass.zip
+    - unzip -o bass.zip
     - cp x64/libbass.so ../lib
+    - curl http://www.un4seen.com/files/bassmidi24-linux.zip -o bassmidi.zip
+    - unzip -o bassmidi.zip
+    - cp x64/libbassmidi.so ../lib
     - curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
-    - unzip bassopus.zip
+    - unzip -o bassopus.zip
     - cp x64/libbassopus.so ../lib
     - cd ..
 
     # Extract Discord RPC
     - mkdir discord-rpc
     - cd discord-rpc
     - curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc_linux.zip
-    - unzip discord_rpc_linux.zip
+    - unzip -o discord_rpc_linux.zip
     - cp discord-rpc/linux-dynamic/lib/libdiscord-rpc.so ../lib
     - cd ..
 
@@ -99,10 +102,13 @@ build windows i686:
     - mkdir bass
     - cd bass
     - curl http://www.un4seen.com/files/bass24.zip -o bass.zip
-    - unzip bass.zip
+    - unzip -o bass.zip
     - cp bass.dll ../lib
+    - curl http://www.un4seen.com/files/bassmidi24.zip -o bassmidi.zip
+    - unzip -o bassmidi.zip
+    - cp bassmidi.dll ../lib
     - curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
-    - unzip bassopus.zip
+    - unzip -o bassopus.zip
     - cp bassopus.dll ../lib
     - cd ..
 

Attorney_Online.pro

@@ -38,6 +38,7 @@ contains(DEFINES, DISCORD) {
 DEFINES += BASSAUDIO
 LIBS += -lbass
 LIBS += -lbassopus
+LIBS += -lbassmidi
 
 macx:LIBS += -framework CoreFoundation -framework Foundation -framework CoreServices
 

CMakeLists.txt

@@ -34,7 +34,7 @@ target_include_directories(Attorney_Online PRIVATE include)
 find_package(Qt5 COMPONENTS Core Gui Network Widgets REQUIRED)
 target_link_directories(Attorney_Online PRIVATE lib)
 target_link_libraries(Attorney_Online PRIVATE Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets
-    bass bassopus discord-rpc)
+    bass bassmidi bassopus discord-rpc)
 target_compile_definitions(Attorney_Online PRIVATE DISCORD)
 
 # Subdirectories

include/CMakeLists.txt

@@ -16,6 +16,7 @@ aopacket.h
 aosfxplayer.h
 aotextarea.h
 bass.h
+bassmidi.h
 bassopus.h
 chatlogpiece.h
 courtroom.h

include/aoapplication.h

@@ -7,6 +7,7 @@
 #include "discord_rich_presence.h"
 
 #include "bass.h"
+#include "bassmidi.h"
 #include "bassopus.h"
 
 #include <QApplication>
@@ -540,6 +541,7 @@ class AOApplication : public QApplication {
 
   void initBASS();
   static void load_bass_opus_plugin();
+  static void load_bass_midi_plugin();
   static void CALLBACK BASSreset(HSTREAM handle, DWORD channel, DWORD data,
                                  void *user);
   static void doBASSreset();

include/aomusicplayer.h

@@ -3,6 +3,7 @@
 #include "file_functions.h"
 
 #include "bass.h"
+#include "bassmidi.h"
 #include "bassopus.h"
 
 #include "aoapplication.h"