This commit is contained in:
stonedDiscord 2019-03-12 20:47:47 +01:00
parent 71da60b5d6
commit 1514ffea6a
2 changed files with 90 additions and 6 deletions

View File

@ -1,13 +1,18 @@
#ifndef AOMUSICPLAYER_H
#define AOMUSICPLAYER_H
#if defined(BASSAUDIO)
#include "bass.h"
#elif defined(QTAUDIO)
#include <QMediaPlayer>
#endif
#include "aoapplication.h"
#include <QWidget>
#include <string.h>
#include <QDebug>
#if defined(BASSAUDIO)
class AOMusicPlayer
{
public:
@ -24,5 +29,37 @@ private:
int m_volume = 0;
HSTREAM m_stream;
};
#elif defined(QTAUDIO)
class AOMusicPlayer
{
public:
AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
~AOMusicPlayer();
void play(QString p_song);
void set_volume(int p_value);
private:
QMediaPlayer m_player;
QWidget *m_parent;
AOApplication *ao_app;
int m_volume = 0;
};
#else
class AOMusicPlayer
{
public:
AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app);
~AOMusicPlayer();
void play(QString p_song);
void set_volume(int p_value);
private:
QWidget *m_parent;
AOApplication *ao_app;
};
#endif
#endif // AOMUSICPLAYER_H

View File

@ -1,5 +1,6 @@
#include "aomusicplayer.h"
#if defined(BASSAUDIO)
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
@ -8,14 +9,11 @@ AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
AOMusicPlayer::~AOMusicPlayer()
{
#ifdef BASSAUDIO
BASS_ChannelStop(m_stream);
#endif
}
void AOMusicPlayer::play(QString p_song)
{
#ifdef BASSAUDIO
BASS_ChannelStop(m_stream);
QString f_path = ao_app->get_music_path(p_song);
@ -27,14 +25,63 @@ void AOMusicPlayer::play(QString p_song)
if (ao_app->get_audio_output_device() != "default")
BASS_ChannelSetDevice(m_stream, BASS_GetDevice());
BASS_ChannelPlay(m_stream, false);
#endif
}
void AOMusicPlayer::set_volume(int p_value)
{
m_volume = p_value;
float volume = m_volume / 100.0f;
#ifdef BASSAUDIO
BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume);
#endif
}
#elif defined(QTAUDIO)
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
ao_app = p_ao_app;
}
AOMusicPlayer::~AOMusicPlayer()
{
m_player.stop();
}
void AOMusicPlayer::play(QString p_song)
{
m_player.stop();
QString f_path = ao_app->get_music_path(p_song);
m_player.setMedia(QUrl::fromLocalFile(f_path));
this->set_volume(m_volume);
m_player.play();
}
void AOMusicPlayer::set_volume(int p_value)
{
m_volume = p_value;
m_player.setVolume(m_volume);
}
#else
AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
{
m_parent = parent;
ao_app = p_ao_app;
}
AOMusicPlayer::~AOMusicPlayer()
{
}
void AOMusicPlayer::play(QString p_song)
{
}
void AOMusicPlayer::set_volume(int p_value)
{
}
#endif