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

more elegantly handle streaming urls (#443)

Browse Source
This commit is contained in:
in1tiate 2021-01-28 15:35:50 -06:00 committed by GitHub
parent 9c6e703bfc
commit 3683e54501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/courtroom.cpp
View File

@ -3659,6 +3659,11 @@ void Courtroom::handle_song(QStringList *p_contents)
QString f_song = f_contents.at(0); QString f_song = f_contents.at(0);
QString f_song_clear = f_song.left(f_song.lastIndexOf(".")); QString f_song_clear = f_song.left(f_song.lastIndexOf("."));
if (f_song.startsWith("http")) {
QByteArray f_song_bytearray = f_song.toUtf8();
QString f_song_decoded = QUrl::fromPercentEncoding(f_song_bytearray);
f_song_clear = f_song_decoded.left(f_song_decoded.lastIndexOf("."));
}
f_song_clear = f_song_clear.right(f_song_clear.length() - f_song_clear = f_song_clear.right(f_song_clear.length() -
(f_song_clear.lastIndexOf("/") + 1)); (f_song_clear.lastIndexOf("/") + 1));
int n_char = f_contents.at(1).toInt(); int n_char = f_contents.at(1).toInt();
@ -3691,8 +3696,10 @@ void Courtroom::handle_song(QStringList *p_contents)
if (f_song == "~stop.mp3") if (f_song == "~stop.mp3")
ui_music_name->setText(tr("None")); ui_music_name->setText(tr("None"));
else if (channel == 0) { else if (channel == 0) {
if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song)))) if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song))) & !f_song.startsWith("http"))
ui_music_name->setText(f_song_clear); ui_music_name->setText(f_song_clear);
else if (f_song.startsWith("http"))
ui_music_name->setText(tr("[STREAM] %1").arg(f_song_clear));
else else
ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear)); ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear));
} }
@ -3733,8 +3740,10 @@ void Courtroom::handle_song(QStringList *p_contents)
if (f_song == "~stop.mp3") if (f_song == "~stop.mp3")
ui_music_name->setText(tr("None")); ui_music_name->setText(tr("None"));
else if (channel == 0) { else if (channel == 0) {
if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song)))) if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song))) & !f_song.startsWith("http"))
ui_music_name->setText(f_song_clear); ui_music_name->setText(f_song_clear);
else if (f_song.startsWith("http"))
ui_music_name->setText(tr("[STREAM] %1").arg(f_song_clear));
else else
ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear)); ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear));
} }