aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsD <stoned@derpymail.org>2020-05-23 19:21:25 +0200
committersD <stoned@derpymail.org>2020-05-23 19:21:25 +0200
commit7a7dd25459f19796e38fde2148304376389a7a16 (patch)
treedbe0489e5e87044ea1902326158943efaa1414ff
parent8a4fc4516c406a2fa63039310914c6a5514e7c04 (diff)
i don't need this 3 times
-rw-r--r--src/aomusicplayer.cpp14
-rw-r--r--src/aosfxplayer.cpp14
2 files changed, 5 insertions, 23 deletions
diff --git a/src/aomusicplayer.cpp b/src/aomusicplayer.cpp
index 5878dcdc..8ba16418 100644
--- a/src/aomusicplayer.cpp
+++ b/src/aomusicplayer.cpp
@@ -1,12 +1,14 @@
#include "aomusicplayer.h"
-#ifdef BASSAUDIO
+
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
ao_app = p_ao_app;
}
+#ifdef BASSAUDIO
+
AOMusicPlayer::~AOMusicPlayer()
{
for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) {
@@ -170,11 +172,6 @@ void AOMusicPlayer::set_looping(bool toggle, int channel)
}
}
#elif defined(QTAUDIO)
-AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
-{
- m_parent = parent;
- ao_app = p_ao_app;
-}
AOMusicPlayer::~AOMusicPlayer() {
for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) {
@@ -211,11 +208,6 @@ void AOMusicPlayer::set_volume(int p_value, int channel)
}
#else
-AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
-{
- m_parent = parent;
- ao_app = p_ao_app;
-}
AOMusicPlayer::~AOMusicPlayer() {}
diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp
index 121ac0b3..6fb5becf 100644
--- a/src/aosfxplayer.cpp
+++ b/src/aosfxplayer.cpp
@@ -1,13 +1,14 @@
#include "aosfxplayer.h"
#include "file_functions.h"
-#if defined(BASSAUDIO) // Using bass.dll for sfx
+
AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
ao_app = p_ao_app;
}
+#if defined(BASSAUDIO) // Using bass.dll for sfx
void AOSfxPlayer::clear()
{
for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) {
@@ -112,11 +113,6 @@ void AOSfxPlayer::set_looping(bool toggle, int channel)
}
}
#elif defined(QTAUDIO) // Using Qt's QSoundEffect class
-AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
-{
- m_parent = parent;
- ao_app = p_ao_app;
-}
void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout)
{
@@ -164,12 +160,6 @@ void AOSfxPlayer::set_volume_internal(qreal p_value)
m_sfx.setVolume(m_volume);
}
#else
-AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
-{
- m_parent = parent;
- ao_app = p_ao_app;
-}
-
void AOSfxPlayer::clear() {}
void AOSfxPlayer::loop_clear() {}