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

75
src/packet_distribution.cpp
View File

@ -511,58 +511,39 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
} }
else if (header == "SM") else if (header == "SM")
{ {
if (!courtroom_constructed) if (!courtroom_constructed)
goto end; goto end;
bool musics_time = false; bool musics_time = false;
area_count = 0; area_count = 0;
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;
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(".mp3") ||
f_contents.at(n_element).endsWith(".mp4") ||
f_contents.at(n_element).endsWith(".ogg") ||
f_contents.at(n_element).endsWith(".opus"))
{ {
musics_time = true; if (!musics_time && (f_contents.at(n_element).startsWith("==") ||
// w_courtroom->fix_last_area(); f_contents.at(n_element).endsWith(".wav") ||
w_courtroom->append_music(f_contents.at(n_element)); f_contents.at(n_element).endsWith(".mp3") ||
area_count--; f_contents.at(n_element).endsWith(".mp4") ||
f_contents.at(n_element).endsWith(".ogg") ||
f_contents.at(n_element).endsWith(".opus")))
{
musics_time = true;
continue;
}
AOPacketLoadMusicThreading *music_load = new AOPacketLoadMusicThreading(this, f_contents.at(n_element), musics_time);
QThreadPool::globalInstance()->start(music_load);
++loaded_music;
int total_loading_size = char_list_size * 2 + evidence_list_size + music_list_size;
int loading_value = int(((loaded_chars + generated_chars + loaded_music + loaded_evidence) / static_cast<double>(total_loading_size)) * 100);
w_lobby->set_loading_value(loading_value);
w_lobby->set_loading_text("Loading music:\n" + QString::number(loaded_music) + "/" + QString::number(music_list_size));
if(QThreadPool::globalInstance()->activeThreadCount() == QThreadPool::globalInstance()->maxThreadCount())
{
QThreadPool::globalInstance()->waitForDone(); //out of order music is bad
}
} }
else QThreadPool::globalInstance()->waitForDone();
{
w_courtroom->append_area(f_contents.at(n_element));
area_count++;
}
}
AOPacketLoadMusicThreading *music_load = new AOPacketLoadMusicThreading(this, f_contents.at(n_element), musics_time); send_server_packet(new AOPacket("RD#%"));
QThreadPool::globalInstance()->start(music_load);
++loaded_music;
int total_loading_size = char_list_size * 2 + evidence_list_size + music_list_size;
int loading_value = int(((loaded_chars + generated_chars + loaded_music + loaded_evidence) / static_cast<double>(total_loading_size)) * 100);
w_lobby->set_loading_value(loading_value);
w_lobby->set_loading_text("Loading music:\n" + QString::number(loaded_music) + "/" + QString::number(music_list_size));
if(QThreadPool::globalInstance()->activeThreadCount() == QThreadPool::globalInstance()->maxThreadCount())
{
QThreadPool::globalInstance()->waitForDone(); //out of order music is bad
}
}
QThreadPool::globalInstance()->waitForDone();
send_server_packet(new AOPacket("RD#%"));
} }
else if (header == "DONE") else if (header == "DONE")
{ {