fix up nomusic

This commit is contained in:
sD 2020-05-23 17:21:22 +02:00
parent 80daf94895
commit 52736498b1
4 changed files with 24 additions and 8 deletions

View File

@ -67,14 +67,28 @@ private:
class AOMusicPlayer {
public:
AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
~AOMusicPlayer();
virtual ~AOMusicPlayer();
void set_volume(int p_value, int channel = -1);
void set_looping(bool toggle, int channel = 0);
void play(QString p_song);
void set_volume(int p_value);
const int m_channelmax = 4;
public slots:
void play(QString p_song, int channel = 0, bool loop = false,
int effect_flags = 0);
void stop(int channel = 0);
private:
QWidget *m_parent;
AOApplication *ao_app;
bool m_looping = false;
int m_volume[4] = {0, 0, 0, 0};
// Channel 0 = music
// Channel 1 = ambience
// Channel 2 = extra
// Channel 3 = extra
};
#endif

View File

@ -100,7 +100,7 @@ void AOBlipPlayer::set_blips(QString p_sfx) {}
void AOBlipPlayer::blip_tick() {}
void AOBlipPlayer::set_volume(qreal p_value) {}
void AOBlipPlayer::set_volume(int p_value) {}
void AOBlipPlayer::set_volume_internal(qreal p_value) {}
#endif

View File

@ -205,7 +205,8 @@ AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
AOMusicPlayer::~AOMusicPlayer() {}
void AOMusicPlayer::play(QString p_song) {}
void AOMusicPlayer::play(QString p_song, int channel, bool loop,
int effect_flags) {}
void AOMusicPlayer::set_volume(int p_value) {}
void AOMusicPlayer::set_volume(int p_value, int channel) {}
#endif

View File

@ -170,9 +170,10 @@ AOSfxPlayer::AOSfxPlayer(QWidget *parent, AOApplication *p_ao_app)
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,
int channel) {}
void AOSfxPlayer::stop() {}
void AOSfxPlayer::stop(int channel) {}
void AOSfxPlayer::set_volume(qreal p_value) {}