1 files changed, 10 insertions, 5 deletions
diff --git a/src/aoapplication.h b/src/aoapplication.h
index 5e67fc8..3773f16 100644
--- a/src/aoapplication.h
+++ b/src/aoapplication.h
@@ -7,7 +7,9 @@
 #include "serverdata.h"
 #include "widgets/aooptionsdialog.h"
 
-#include <bass.h>
+#include "miniaudio.h"
+#include "miniaudio_libvorbis.h"
+#include "miniaudio_libopus.h"
 
 #include <QColor>
 #include <QCryptographicHash>
@@ -330,19 +332,22 @@ public:
   bool pointExistsOnScreen(QPoint point);
   void centerOrMoveWidgetOnPrimaryScreen(QWidget *widget);
 
-  void initBASS();
-  static void load_bass_plugins();
-  static void CALLBACK BASSreset(HSTREAM handle, DWORD channel, DWORD data, void *user);
-  static void doBASSreset();
+  void initAudio();
 
   QElapsedTimer demo_timer;
   DemoServer *demo_server = nullptr;
 
+  ma_engine audio_engine;
+  // Vorbis and Opus decoders.
+  ma_decoding_backend_vtable *mus_decoders[2];
+  ma_decoder_config mus_decoder_config;
+
 private:
   QVector<ServerInfo> server_list;
   QHash<size_t, QString> asset_lookup_cache;
   QHash<size_t, QString> dir_listing_cache;
   QSet<size_t> dir_listing_exist_cache;
+  ma_resource_manager audio_rm;
 
 public Q_SLOTS:
   void server_connected();