1 files changed, 6 insertions, 16 deletions
diff --git a/aomusicplayer.cpp b/aomusicplayer.cpp
index 9e763582..62aa7302 100644
--- a/aomusicplayer.cpp
+++ b/aomusicplayer.cpp
@@ -4,34 +4,24 @@ AOMusicPlayer::AOMusicPlayer(QWidget *parent, AOApplication *p_ao_app)
 {
   m_parent = parent;
   ao_app = p_ao_app;
+  m_player = new QMediaPlayer();
 }
 
 AOMusicPlayer::~AOMusicPlayer()
 {
-  BASS_ChannelStop(m_stream);
+  m_player->stop();
+  m_player->deleteLater();
 }
 
 void AOMusicPlayer::play(QString p_song)
 {
-  BASS_ChannelStop(m_stream);
-
-  QString f_path = ao_app->get_music_path(p_song);
-
-  m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE);
-
+  m_player->setMedia(QUrl::fromLocalFile(ao_app->get_music_path(p_song)));
   this->set_volume(m_volume);
-
-  if (ao_app->get_audio_output_device() != "Default")
-    BASS_ChannelSetDevice(m_stream, BASS_GetDevice());
-  BASS_ChannelPlay(m_stream, false);
+  m_player->play();
 }
 
 void AOMusicPlayer::set_volume(int p_value)
 {
   m_volume = p_value;
-
-  float volume = m_volume / 100.0f;
-
-  BASS_ChannelSetAttribute(m_stream, BASS_ATTRIB_VOL, volume);
-
+  m_player->setVolume(p_value);
 }