5 files changed, 17 insertions, 4 deletions
diff --git a/aoblipplayer.cpp b/aoblipplayer.cpp
index 089d428..5e3929e 100644
--- a/aoblipplayer.cpp
+++ b/aoblipplayer.cpp
@@ -7,6 +7,12 @@ AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
   ao_app = p_ao_app;
 }
 
+AOBlipPlayer::~AOBlipPlayer()
+{
+  m_sfxplayer->stop();
+  m_sfxplayer->deleteLater();
+}
+
 void AOBlipPlayer::set_blips(QString p_sfx)
 {
   m_sfxplayer->stop();
@@ -23,6 +29,5 @@ void AOBlipPlayer::blip_tick()
 void AOBlipPlayer::set_volume(int p_value)
 {
   m_volume = p_value;
-  float volume = p_value / 100.0f;
-  m_sfxplayer->setVolume(qreal(volume));
+  m_sfxplayer->setVolume(p_value / 100.0);
 }
diff --git a/aoblipplayer.h b/aoblipplayer.h
index 626d3bb..c8a8cb6 100644
--- a/aoblipplayer.h
+++ b/aoblipplayer.h
@@ -12,6 +12,7 @@ class AOBlipPlayer
 {
 public:
   AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app);
+  ~AOBlipPlayer();
 
   void set_blips(QString p_sfx);
   void blip_tick();
diff --git a/aomusicplayer.cpp b/aomusicplayer.cpp
index 0bc02c4..ca37ac7 100644
--- a/aomusicplayer.cpp
+++ b/aomusicplayer.cpp
@@ -10,6 +10,7 @@ AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
 AOMusicPlayer::~AOMusicPlayer()
 {
   m_player->stop();
+  m_player->deleteLater();
 }
 
 void AOMusicPlayer::play(QString p_song)
diff --git a/aosfxplayer.cpp b/aosfxplayer.cpp
index 4a772e0..cc2f383 100644
--- a/aosfxplayer.cpp
+++ b/aosfxplayer.cpp
@@ -7,6 +7,12 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
   ao_app = p_ao_app;
 }
 
+AOSfxPlayer::~AOSfxPlayer()
+{
+  m_sfxplayer->stop();
+  m_sfxplayer->deleteLater();
+}
+
 void AOSfxPlayer::play(QString p_sfx, QString p_char)
 {
   m_sfxplayer->stop();
@@ -31,6 +37,5 @@ void AOSfxPlayer::stop()
 void AOSfxPlayer::set_volume(int p_value)
 {
   m_volume = p_value;
-  float volume = p_value / 100.0f;
-  m_sfxplayer->setVolume(qreal(volume));
+  m_sfxplayer->setVolume(p_value / 100.0);
 }
diff --git a/aosfxplayer.h b/aosfxplayer.h
index 9fc7564..1b73e49 100644
--- a/aosfxplayer.h
+++ b/aosfxplayer.h
@@ -12,6 +12,7 @@ class AOSfxPlayer
 {
 public:
   AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app);
+  ~AOSfxPlayer();
 
   void play(QString p_sfx, QString p_char = "");
   void stop();