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

Merge pull request #134 from AttorneyOnline/streammusic

Browse Source 
Streaming music
This commit is contained in:
stonedDiscord 2020-04-19 16:10:59 +02:00 committed by GitHub
commit 1e2d71fb96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/aomusicplayer.cpp
View File

@ -18,7 +18,11 @@ void AOMusicPlayer::play(QString p_song)
f_path = ao_app->get_music_path(p_song); f_path = ao_app->get_music_path(p_song);
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); m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE);
}
this->set_volume(m_volume); this->set_volume(m_volume);

6
src/path_functions.cpp
View File

@ -99,7 +99,11 @@ QString AOApplication::get_music_path(QString p_song)
QString withending_check = get_base_path() + "sounds/music/" + p_song; QString withending_check = get_base_path() + "sounds/music/" + p_song;
QString mp3_check = get_base_path() + "sounds/music/" + p_song + ".mp3"; QString mp3_check = get_base_path() + "sounds/music/" + p_song + ".mp3";
QString opus_check = get_base_path() + "sounds/music/" + p_song + ".opus"; 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 #ifndef CASE_SENSITIVE_FILESYSTEM
return opus_check; return opus_check;