Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -146,7 +146,6 @@ const qint64 MAXIMUM_CACHE_SIZE = 10 * BYTES_PER_GIGABYTES; // 10GB · 145 unmodified lines | |||
| 146 | 146 | ||
| 147 | static QTimer* locationUpdateTimer = NULL; | 147 | static QTimer* locationUpdateTimer = NULL; |
| 148 | static QTimer* balanceUpdateTimer = NULL; | 148 | static QTimer* balanceUpdateTimer = NULL; |
| 149 | static QTimer* silentNodeTimer = NULL; | ||
| 150 | static QTimer* identityPacketTimer = NULL; | 149 | static QTimer* identityPacketTimer = NULL; |
| 151 | static QTimer* billboardPacketTimer = NULL; | 150 | static QTimer* billboardPacketTimer = NULL; |
| 152 | static QTimer* checkFPStimer = NULL; | 151 | static QTimer* checkFPStimer = NULL; |
| @@ -426,12 +425,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 273 unmodified lines | |||
| 426 | // connect to the packet sent signal of the _entityEditSender | 425 | // connect to the packet sent signal of the _entityEditSender |
| 427 | connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent); | 426 | connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent); |
| 428 | 427 | ||
| 429 | // move the silentNodeTimer to the _nodeThread | ||
| 430 | silentNodeTimer = new QTimer(); | ||
| 431 | connect(silentNodeTimer, SIGNAL(timeout()), nodeList.data(), SLOT(removeSilentNodes())); | ||
| 432 | silentNodeTimer->start(NODE_SILENCE_THRESHOLD_MSECS); | ||
| 433 | silentNodeTimer->moveToThread(_nodeThread); | ||
| 434 | |||
| 435 | // send the identity packet for our avatar each second to our avatar mixer | 428 | // send the identity packet for our avatar each second to our avatar mixer |
| 436 | identityPacketTimer = new QTimer(); | 429 | identityPacketTimer = new QTimer(); |
| 437 | connect(identityPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendIdentityPacket); | 430 | connect(identityPacketTimer, &QTimer::timeout, _myAvatar, &MyAvatar::sendIdentityPacket); |
| @@ -548,7 +541,6 @@ void Application::cleanupBeforeQuit() { · 110 unmodified lines | |||
| 548 | // depending on what thread they run in | 541 | // depending on what thread they run in |
| 549 | locationUpdateTimer->stop(); | 542 | locationUpdateTimer->stop(); |
| 550 | balanceUpdateTimer->stop(); | 543 | balanceUpdateTimer->stop(); |
| 551 | QMetaObject::invokeMethod(silentNodeTimer, "stop", Qt::BlockingQueuedConnection); | ||
| 552 | identityPacketTimer->stop(); | 544 | identityPacketTimer->stop(); |
| 553 | billboardPacketTimer->stop(); | 545 | billboardPacketTimer->stop(); |
| 554 | checkFPStimer->stop(); | 546 | checkFPStimer->stop(); |
| @@ -558,7 +550,6 @@ void Application::cleanupBeforeQuit() { · 3 unmodified lines | |||
| 558 | // and then delete those that got created by "new" | 550 | // and then delete those that got created by "new" |
| 559 | delete locationUpdateTimer; | 551 | delete locationUpdateTimer; |
| 560 | delete balanceUpdateTimer; | 552 | delete balanceUpdateTimer; |
| 561 | delete silentNodeTimer; | ||
| 562 | delete identityPacketTimer; | 553 | delete identityPacketTimer; |
| 563 | delete billboardPacketTimer; | 554 | delete billboardPacketTimer; |
| 564 | delete checkFPStimer; | 555 | delete checkFPStimer; |