From 2fed94b2d1e8f2c21c3b600a4bd8521da693a0da Mon Sep 17 00:00:00 2001
From: gameboyprinter <gameboyprinter@users.noreply.github.com>
Date: Wed, 29 Aug 2018 00:26:34 -0500
Subject: remove more bass dependencies

---
 aoblipplayer.cpp | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

(limited to 'aoblipplayer.cpp')

diff --git a/aoblipplayer.cpp b/aoblipplayer.cpp
index 9e7d0e5d..089d428c 100644
--- a/aoblipplayer.cpp
+++ b/aoblipplayer.cpp
@@ -2,44 +2,27 @@
 
 AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
+  m_sfxplayer = new QSoundEffect;
   m_parent = parent;
   ao_app = p_ao_app;
 }
 
 void AOBlipPlayer::set_blips(QString p_sfx)
 {
+  m_sfxplayer->stop();
   QString f_path = ao_app->get_sounds_path() + p_sfx.toLower();
-
-  for (int n_stream = 0 ; n_stream < BLIP_COUNT ; ++n_stream)
-  {
-    BASS_StreamFree(m_stream_list[n_stream]);
-
-    m_stream_list[n_stream] = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE);
-  }
-
+  m_sfxplayer->setSource(QUrl::fromLocalFile(f_path));
   set_volume(m_volume);
 }
 
 void AOBlipPlayer::blip_tick()
 {
-  int f_cycle = m_cycle++;
-
-  if (m_cycle == BLIP_COUNT)
-    m_cycle = 0;
-
-  HSTREAM f_stream = m_stream_list[f_cycle];
-
-  BASS_ChannelPlay(f_stream, false);
+  m_sfxplayer->play();
 }
 
 void AOBlipPlayer::set_volume(int p_value)
 {
   m_volume = p_value;
-
   float volume = p_value / 100.0f;
-
-  for (int n_stream = 0 ; n_stream < BLIP_COUNT ; ++n_stream)
-  {
-    BASS_ChannelSetAttribute(m_stream_list[n_stream], BASS_ATTRIB_VOL, volume);
-  }
+  m_sfxplayer->setVolume(qreal(volume));
 }
-- 
cgit