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

i don't need this 3 times

Browse Source
This commit is contained in:
sD 2020-05-23 19:21:25 +02:00
parent 8a4fc4516c
commit 7a7dd25459
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/aomusicplayer.cpp
View File

@ -1,12 +1,14 @@
#include "aomusicplayer.h" #include "aomusicplayer.h"
#ifdef BASSAUDIO
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app) AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
} }
#ifdef BASSAUDIO
AOMusicPlayer::~AOMusicPlayer() AOMusicPlayer::~AOMusicPlayer()
{ {
for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) { 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) #elif defined(QTAUDIO)
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
ao_app = p_ao_app;
}
AOMusicPlayer::~AOMusicPlayer() { AOMusicPlayer::~AOMusicPlayer() {
for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) { 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 #else
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
ao_app = p_ao_app;
}
AOMusicPlayer::~AOMusicPlayer() {} AOMusicPlayer::~AOMusicPlayer() {}

14
src/aosfxplayer.cpp
View File

@ -1,13 +1,14 @@
#include "aosfxplayer.h" #include "aosfxplayer.h"
#include "file_functions.h" #include "file_functions.h"
#if defined(BASSAUDIO) // Using bass.dll for sfx
AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app) AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
} }
#if defined(BASSAUDIO) // Using bass.dll for sfx
void AOSfxPlayer::clear() void AOSfxPlayer::clear()
{ {
for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) { 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 #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) 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); m_sfx.setVolume(m_volume);
} }
#else #else
AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
ao_app = p_ao_app;
}
void AOSfxPlayer::clear() {} void AOSfxPlayer::clear() {}
void AOSfxPlayer::loop_clear() {} void AOSfxPlayer::loop_clear() {}