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

replace music loading

Browse Source
This commit is contained in:
sD 2020-02-23 11:43:41 +01:00
parent 16bd89b6ad
commit 444b0ff60f
1 changed files with 28 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/packet_distribution.cpp
View File

@ -519,35 +519,16 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
for (int n_element = 0 ; n_element < f_contents.size() ; ++n_element) for (int n_element = 0 ; n_element < f_contents.size() ; ++n_element)
{ {
++loaded_music; if (!musics_time && (f_contents.at(n_element).startsWith("==") ||
w_lobby->set_loading_text(tr("Loading music:\n%1/%2").arg(QString::number(loaded_music)).arg(QString::number(music_list_size)));
if (musics_time)
{
w_courtroom->append_music(f_contents.at(n_element));
}
else
{
if (f_contents.at(n_element).startsWith("==") ||
f_contents.at(n_element).endsWith(".wav") || f_contents.at(n_element).endsWith(".wav") ||
f_contents.at(n_element).endsWith(".mp3") || f_contents.at(n_element).endsWith(".mp3") ||
f_contents.at(n_element).endsWith(".mp4") || f_contents.at(n_element).endsWith(".mp4") ||
f_contents.at(n_element).endsWith(".ogg") || f_contents.at(n_element).endsWith(".ogg") ||
f_contents.at(n_element).endsWith(".opus")) f_contents.at(n_element).endsWith(".opus")))
{ {
musics_time = true; musics_time = true;
// w_courtroom->fix_last_area(); continue;
w_courtroom->append_music(f_contents.at(n_element));
area_count--;
} }
else
{
w_courtroom->append_area(f_contents.at(n_element));
area_count++;
}
}
AOPacketLoadMusicThreading *music_load = new AOPacketLoadMusicThreading(this, f_contents.at(n_element), musics_time); AOPacketLoadMusicThreading *music_load = new AOPacketLoadMusicThreading(this, f_contents.at(n_element), musics_time);
QThreadPool::globalInstance()->start(music_load); QThreadPool::globalInstance()->start(music_load);
++loaded_music; ++loaded_music;