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

Use QMediaPlayer instead of bass for music

Browse Source
This commit is contained in:
gameboyprinter 2018-08-28 23:58:54 -05:00
parent 355bd1dbbb
commit bd5ac3ea21
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
aomusicplayer.cpp
View File

@ -4,32 +4,23 @@ AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
{ {
m_parent = parent; m_parent = parent;
ao_app = p_ao_app; ao_app = p_ao_app;
m_player = new QMediaPlayer;
} }
AOMusicPlayer::~AOMusicPlayer() AOMusicPlayer::~AOMusicPlayer()
{ {
BASS_ChannelStop(m_stream); m_player->stop();
} }
void AOMusicPlayer::play(QString p_song) void AOMusicPlayer::play(QString p_song)
{ {
BASS_ChannelStop(m_stream); m_player->setMedia(QUrl::fromLocalFile(ao_app->get_music_path(p_song)));
this->set_volume(50);
QString f_path = ao_app->get_music_path(p_song); m_player->play();
m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE);
this->set_volume(m_volume);
BASS_ChannelPlay(m_stream, false);
} }
void AOMusicPlayer::set_volume(int p_value) void AOMusicPlayer::set_volume(int p_value)
{ {
m_volume = p_value; m_volume = p_value;
m_player->setVolume(p_value);
float volume = m_volume / 100.0f;
BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume);
} }

2
aomusicplayer.h
View File

@ -7,6 +7,7 @@
#include <QWidget> #include <QWidget>
#include <string.h> #include <string.h>
#include <QDebug> #include <QDebug>
#include <QMediaPlayer>
class AOMusicPlayer class AOMusicPlayer
{ {
@ -21,6 +22,7 @@ private:
QWidget *m_parent; QWidget *m_parent;
AOApplication *ao_app; AOApplication *ao_app;
QMediaPlayer *m_player;
int m_volume = 0; int m_volume = 0;
HSTREAM m_stream; HSTREAM m_stream;
}; };