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

Deprecate demo playback /min_wait (#498)

Browse Source
This commit is contained in:
Crystalwarrior 2021-03-20 21:41:35 +03:00 committed by GitHub
parent 4bfd9f0d14
commit e3ba27c47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/demoserver.h
View File

@ -20,7 +20,6 @@ public:
bool server_started = false; bool server_started = false;
int port = 27088; int port = 27088;
int max_wait = -1; int max_wait = -1;
int min_wait = -1;
private: private:
void handle_packet(AOPacket packet); void handle_packet(AOPacket packet);

31
src/demoserver.cpp
View File

@ -212,35 +212,11 @@ void DemoServer::handle_packet(AOPacket packet)
} }
else if (contents[1].startsWith("/min_wait")) else if (contents[1].startsWith("/min_wait"))
{ {
QStringList args = contents[1].split(" "); client_sock->write("CT#DEMO#min_wait is deprecated. Use the client Settings for minimum wait instead!");
if (args.size() > 1)
{
bool ok;
int p_min_wait = args.at(1).toInt(&ok);
if (ok)
{
if (p_min_wait < 0)
p_min_wait = -1;
min_wait = p_min_wait;
client_sock->write("CT#DEMO#Setting min_wait to ");
client_sock->write(QString::number(min_wait).toUtf8());
client_sock->write(" milliseconds.#1#%");
}
else
{
client_sock->write("CT#DEMO#Not a valid integer!#1#%");
}
}
else
{
client_sock->write("CT#DEMO#Current min_wait is ");
client_sock->write(QString::number(min_wait).toUtf8());
client_sock->write(" milliseconds.#1#%");
}
} }
else if (contents[1].startsWith("/help")) else if (contents[1].startsWith("/help"))
{ {
client_sock->write("CT#DEMO#Available commands:\nload, play, pause, max_wait, min_wait, help#1#%"); client_sock->write("CT#DEMO#Available commands:\nload, play, pause, max_wait, help#1#%");
} }
} }
} }
@ -285,9 +261,6 @@ void DemoServer::playback()
int duration = wait_packet.get_contents().at(0).toInt(); int duration = wait_packet.get_contents().at(0).toInt();
if (max_wait != -1 && duration + elapsed_time > max_wait) if (max_wait != -1 && duration + elapsed_time > max_wait)
duration = qMax(0, max_wait - elapsed_time); duration = qMax(0, max_wait - elapsed_time);
// We use elapsed_time to make sure that the packet we're using min_wait on is "priority" (e.g. IC)
if (elapsed_time == 0 && min_wait != -1 && duration < min_wait)
duration = min_wait;
elapsed_time += duration; elapsed_time += duration;
timer->start(duration); timer->start(duration);
} }