Merge pull request #134 from AttorneyOnline/streammusic
Streaming music
This commit is contained in:
commit
1e2d71fb96
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user