1 files changed, 25 insertions, 11 deletions

diff --git a/aoblipplayer.cpp b/aoblipplayer.cpp
index 5e3929e2..0ea08978 100644
--- a/aoblipplayer.cpp
+++ b/aoblipplayer.cpp
@@ -2,32 +2,46 @@
 
 AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
-  m_sfxplayer = new QSoundEffect;
   m_parent = parent;
   ao_app = p_ao_app;
 }
 
-AOBlipPlayer::~AOBlipPlayer()
-{
-  m_sfxplayer->stop();
-  m_sfxplayer->deleteLater();
-}
-
 void AOBlipPlayer::set_blips(QString p_sfx)
 {
-  m_sfxplayer->stop();
   QString f_path = ao_app->get_sounds_path() + p_sfx.toLower();
-  m_sfxplayer->setSource(QUrl::fromLocalFile(f_path));
+
+  for (int n_stream = 0 ; n_stream < 5 ; ++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);
+  }
+
   set_volume(m_volume);
 }
 
 void AOBlipPlayer::blip_tick()
 {
-  m_sfxplayer->play();
+  int f_cycle = m_cycle++;
+
+  if (m_cycle == 5)
+    m_cycle = 0;
+
+  HSTREAM f_stream = m_stream_list[f_cycle];
+
+  if (ao_app->get_audio_output_device() != "Default")
+    BASS_ChannelSetDevice(f_stream, BASS_GetDevice());
+  BASS_ChannelPlay(f_stream, false);
 }
 
 void AOBlipPlayer::set_volume(int p_value)
 {
   m_volume = p_value;
-  m_sfxplayer->setVolume(p_value / 100.0);
+
+  float volume = p_value / 100.0f;
+
+  for (int n_stream = 0 ; n_stream < 5 ; ++n_stream)
+  {
+    BASS_ChannelSetAttribute(m_stream_list[n_stream], BASS_ATTRIB_VOL, volume);
+  }
 }