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

Merge pull request #664 from AttorneyOnline/fix-music-segfaults

Browse Source 
Don't run the base content vpath shenanigans if music path is HTTP
This commit is contained in:
oldmud0 2022-02-20 19:17:11 -06:00 committed by GitHub
commit f3d2e7078c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/aomusicplayer.cpp
View File

@ -20,8 +20,6 @@ QString AOMusicPlayer::play(QString p_song, int channel, bool loop,
channel = channel % m_channelmax; channel = channel % m_channelmax;
if (channel < 0) // wtf? if (channel < 0) // wtf?
return "[ERROR] Invalid Channel"; return "[ERROR] Invalid Channel";
QString f_path = ao_app->get_real_path(ao_app->get_music_path(p_song));
unsigned int flags = BASS_STREAM_PRESCAN | BASS_STREAM_AUTOFREE | unsigned int flags = BASS_STREAM_PRESCAN | BASS_STREAM_AUTOFREE |
BASS_UNICODE | BASS_ASYNCFILE; BASS_UNICODE | BASS_ASYNCFILE;
unsigned int streaming_flags = BASS_STREAM_AUTOFREE; unsigned int streaming_flags = BASS_STREAM_AUTOFREE;
@ -29,7 +27,7 @@ QString AOMusicPlayer::play(QString p_song, int channel, bool loop,
flags |= BASS_SAMPLE_LOOP; flags |= BASS_SAMPLE_LOOP;
streaming_flags |= BASS_SAMPLE_LOOP; streaming_flags |= BASS_SAMPLE_LOOP;
} }
QString f_path = p_song;
DWORD newstream; DWORD newstream;
if (f_path.startsWith("http")) { if (f_path.startsWith("http")) {
if (f_path.endsWith(".opus")) if (f_path.endsWith(".opus"))
@ -38,6 +36,7 @@ QString AOMusicPlayer::play(QString p_song, int channel, bool loop,
newstream = BASS_StreamCreateURL(f_path.toStdString().c_str(), 0, streaming_flags, nullptr, 0); newstream = BASS_StreamCreateURL(f_path.toStdString().c_str(), 0, streaming_flags, nullptr, 0);
} else { } else {
f_path = ao_app->get_real_path(ao_app->get_music_path(p_song));
if (f_path.endsWith(".opus")) if (f_path.endsWith(".opus"))
newstream = BASS_OPUS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, flags); newstream = BASS_OPUS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, flags);
else else
@ -46,7 +45,7 @@ QString AOMusicPlayer::play(QString p_song, int channel, bool loop,
int error_code = BASS_ErrorGetCode(); int error_code = BASS_ErrorGetCode();
if (invoking_future.isCanceled() && channel == 0) { if (invoking_future.isCanceled()) {
// Target future has changed. This stream has become irrelevant. // Target future has changed. This stream has become irrelevant.
// So even if the stream manages to finish after the latest one, we don't run // So even if the stream manages to finish after the latest one, we don't run
// into order issues. // into order issues.