Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add destructors to sound objects

Browse Source
This commit is contained in:
oldmud0 2018-08-29 14:57:58 -05:00
parent 5bd40225bd
commit 4c5bafdcad
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aoblipplayer.cpp
View File

@ -7,6 +7,12 @@ AOBlipPlayer::AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app)
ao_app = p_ao_app; ao_app = p_ao_app;
} }
AOBlipPlayer::~AOBlipPlayer()
{
m_sfxplayer->stop();
m_sfxplayer->deleteLater();
}
void AOBlipPlayer::set_blips(QString p_sfx) void AOBlipPlayer::set_blips(QString p_sfx)
{ {
m_sfxplayer->stop(); m_sfxplayer->stop();
@ -23,6 +29,5 @@ void AOBlipPlayer::blip_tick()
void AOBlipPlayer::set_volume(int p_value) void AOBlipPlayer::set_volume(int p_value)
{ {
m_volume = p_value; m_volume = p_value;
float volume = p_value / 100.0f; m_sfxplayer->setVolume(p_value / 100.0);
m_sfxplayer->setVolume(qreal(volume));
} }

1
aoblipplayer.h
View File

@ -12,6 +12,7 @@ class AOBlipPlayer
{ {
public: public:
AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app); AOBlipPlayer(QWidget *parent, AOApplication *p_ao_app);
~AOBlipPlayer();
void set_blips(QString p_sfx); void set_blips(QString p_sfx);
void blip_tick(); void blip_tick();

1
aomusicplayer.cpp
View File

@ -10,6 +10,7 @@ AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
AOMusicPlayer::~AOMusicPlayer() AOMusicPlayer::~AOMusicPlayer()
{ {
m_player->stop(); m_player->stop();
m_player->deleteLater();
} }
void AOMusicPlayer::play(QString p_song) void AOMusicPlayer::play(QString p_song)

9
aosfxplayer.cpp
View File

@ -7,6 +7,12 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
ao_app = 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) void AOSfxPlayer::play(QString p_sfx, QString p_char)
{ {
m_sfxplayer->stop(); m_sfxplayer->stop();
@ -31,6 +37,5 @@ void AOSfxPlayer::stop()
void AOSfxPlayer::set_volume(int p_value) void AOSfxPlayer::set_volume(int p_value)
{ {
m_volume = p_value; m_volume = p_value;
float volume = p_value / 100.0f; m_sfxplayer->setVolume(p_value / 100.0);
m_sfxplayer->setVolume(qreal(volume));
} }

1
aosfxplayer.h
View File

@ -12,6 +12,7 @@ class AOSfxPlayer
{ {
public: public:
AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app); AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app);
~AOSfxPlayer();
void play(QString p_sfx, QString p_char = ""); void play(QString p_sfx, QString p_char = "");
void stop(); void stop();