From 1b5c1ebb045414b7fe2b9611a40bd0bf962a5878 Mon Sep 17 00:00:00 2001 From: sD Date: Wed, 1 Apr 2020 12:51:13 +0200 Subject: [PATCH 1/2] don't look in music for URLs --- src/path_functions.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/path_functions.cpp b/src/path_functions.cpp index 72b7acc..37daa03 100644 --- a/src/path_functions.cpp +++ b/src/path_functions.cpp @@ -99,7 +99,11 @@ QString AOApplication::get_music_path(QString p_song) QString withending_check = get_base_path() + "sounds/music/" + p_song; QString mp3_check = get_base_path() + "sounds/music/" + p_song + ".mp3"; QString opus_check = get_base_path() + "sounds/music/" + p_song + ".opus"; - if (file_exists(opus_check)) + if (p_song.startsWith("http")) { + //it's an URL + return p_song; + } + else if (file_exists(opus_check)) { #ifndef CASE_SENSITIVE_FILESYSTEM return opus_check; From 02dd9b0a35a2617a02f8f8abba03404c49b98ca2 Mon Sep 17 00:00:00 2001 From: sD Date: Wed, 1 Apr 2020 12:51:24 +0200 Subject: [PATCH 2/2] bass being bass again --- src/aomusicplayer.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/aomusicplayer.cpp b/src/aomusicplayer.cpp index 74dcc63..9387889 100644 --- a/src/aomusicplayer.cpp +++ b/src/aomusicplayer.cpp @@ -18,7 +18,11 @@ void AOMusicPlayer::play(QString p_song) 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); + if (p_song.startsWith("http")) { + m_stream = BASS_StreamCreateURL(f_path.toStdWString().c_str(), 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE, NULL, NULL); + } else { + m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE); + } this->set_volume(m_volume);