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

small refactor handle_music

Browse Source
This commit is contained in:
Salanto 2021-03-21 04:59:15 +01:00
parent bddf6c67c2
commit a7b208b92d
1 changed files with 29 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/courtroom.cpp
View File

@ -3677,6 +3677,10 @@ void Courtroom::handle_song(QStringList *p_contents)
if (f_contents.size() < 2) if (f_contents.size() < 2)
return; return;
bool looping = false; // No loop due to outdated server using serverside looping
int channel = 0; // Channel 0 is 'master music', other for ambient
int effect_flags = 0; // No effects by default - vanilla functionality
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")) { if (f_song.startsWith("http")) {
@ -3684,69 +3688,31 @@ void Courtroom::handle_song(QStringList *p_contents)
QString f_song_decoded = QUrl::fromPercentEncoding(f_song_bytearray); 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_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();
// Assume the song doesn't loop unless told otherwise (due to most outdated
// servers handling looping through serverside)
bool looping = false;
// Channel 0 is the 'master music', other channels would commonly be used for
// ambience
int channel = 0;
// No effects assumed by default - vanilla functionality
int effect_flags = 0;
if (n_char < 0 || n_char >= char_list.size()) {
int channel = 0;
if (p_contents->length() > 3 && p_contents->at(3) == "1") if (p_contents->length() > 3 && p_contents->at(3) == "1")
looping = true; looping = true;
if (p_contents->length() > if (p_contents->length() > 4) // eyyy we want to change this song's CHANNEL huh
4) // eyyy we want to change this song's CHANNEL huh
channel = p_contents->at(4).toInt(); // let the music player handle it if channel = p_contents->at(4).toInt(); // let the music player handle it if
// it's bigger than the channel list // it's bigger than the channel list
if (p_contents->length() > 5) // Flags provided to us by server such as Fade if (p_contents->length() > 5) { // Flags provided to us by server such as Fade
// In, Fade Out, Sync Pos etc. // In, Fade Out, Sync Pos etc.
{
effect_flags = p_contents->at(5).toInt(); effect_flags = p_contents->at(5).toInt();
} }
music_player->play(f_song, channel, looping, effect_flags);
if (f_song == "~stop.mp3") bool is_stop = (f_song == "~stop.mp3");
ui_music_name->setText(tr("None")); if (!(n_char < 0) && !(n_char >= char_list.size())) {
else if (channel == 0) {
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);
else if (f_song.startsWith("http"))
ui_music_name->setText(tr("[STREAM] %1").arg(f_song_clear));
else
ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear));
}
}
else {
QString str_char = char_list.at(n_char).name; QString str_char = char_list.at(n_char).name;
QString str_show = ao_app->get_showname(str_char); QString str_show = ao_app->get_showname(str_char);
if (p_contents->length() > 2) { if (p_contents->length() > 2) {
if (p_contents->at(2) != "") { if (p_contents->at(2) != "") {
str_show = p_contents->at(2); str_show = p_contents->at(2);
} }
} }
if (p_contents->length() > 3 && p_contents->at(3) == "1") {
looping = true;
}
if (p_contents->length() >
4) // eyyy we want to change this song's CHANNEL huh
channel = p_contents->at(4).toInt(); // let the music player handle it if
// it's bigger than the channel list
if (p_contents->length() > 5) // Flags provided to us by server such as Fade
// In, Fade Out, Sync Pos etc.
{
effect_flags = p_contents->at(5).toInt();
}
bool is_stop = f_song == "~stop.mp3";
if (!mute_map.value(n_char)) { if (!mute_map.value(n_char)) {
if (is_stop) { if (is_stop) {
log_ic_text(str_char, str_show, "", tr("has stopped the music")); log_ic_text(str_char, str_show, "", tr("has stopped the music"));
@ -3756,9 +3722,13 @@ void Courtroom::handle_song(QStringList *p_contents)
log_ic_text(str_char, str_show, f_song, tr("has played a song")); log_ic_text(str_char, str_show, f_song, tr("has played a song"));
append_ic_text(f_song_clear, str_show, tr("has played a song")); append_ic_text(f_song_clear, str_show, tr("has played a song"));
} }
}
}
music_player->play(f_song, channel, looping, effect_flags); music_player->play(f_song, channel, looping, effect_flags);
if (is_stop) if(is_stop) {
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))) && !f_song.startsWith("http")) 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);
@ -3768,8 +3738,6 @@ void Courtroom::handle_song(QStringList *p_contents)
ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear)); ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear));
} }
} }
}
}
void Courtroom::handle_wtce(QString p_wtce, int variant) void Courtroom::handle_wtce(QString p_wtce, int variant)
{ {