Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -512,27 +512,6 @@ std::atomic<uint64_t> DeadlockWatchdogThread::_maxElapsed; · 511 unmodified lines | |||
| 512 | std::atomic<int> DeadlockWatchdogThread::_maxElapsedAverage; | 512 | std::atomic<int> DeadlockWatchdogThread::_maxElapsedAverage; |
| 513 | ThreadSafeMovingAverage<int, DeadlockWatchdogThread::HEARTBEAT_SAMPLES> DeadlockWatchdogThread::_movingAverage; | 513 | ThreadSafeMovingAverage<int, DeadlockWatchdogThread::HEARTBEAT_SAMPLES> DeadlockWatchdogThread::_movingAverage; |
| 514 | 514 | ||
| 515 | bool isDomainURL(QUrl url) { | ||
| 516 | if (!url.isValid()) { | ||
| 517 | return false; | ||
| 518 | } | ||
| 519 | if (url.scheme() == URL_SCHEME_HIFI) { | ||
| 520 | return true; | ||
| 521 | } | ||
| 522 | if (url.scheme() != HIFI_URL_SCHEME_FILE) { | ||
| 523 | // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can | ||
| 524 | // be loaded over http(s) | ||
| 525 | // && url.scheme() != HIFI_URL_SCHEME_HTTP && | ||
| 526 | // url.scheme() != HIFI_URL_SCHEME_HTTPS | ||
| 527 | return false; | ||
| 528 | } | ||
| 529 | if (url.path().endsWith(".json", Qt::CaseInsensitive) || | ||
| 530 | url.path().endsWith(".json.gz", Qt::CaseInsensitive)) { | ||
| 531 | return true; | ||
| 532 | } | ||
| 533 | return false; | ||
| 534 | } | ||
| 535 | |||
| 536 | #ifdef Q_OS_WIN | 515 | #ifdef Q_OS_WIN |
| 537 | static const UINT UWM_IDENTIFY_INSTANCES = | 516 | static const UINT UWM_IDENTIFY_INSTANCES = |
| 538 | RegisterWindowMessage("UWM_IDENTIFY_INSTANCES_{8AB82783-B74A-4258-955B-8188C22AA0D6}_" + qgetenv("USERNAME")); | 517 | RegisterWindowMessage("UWM_IDENTIFY_INSTANCES_{8AB82783-B74A-4258-955B-8188C22AA0D6}_" + qgetenv("USERNAME")); |
| @@ -564,14 +543,6 @@ public: · 25 unmodified lines | |||
| 564 | return true; | 543 | return true; |
| 565 | } | 544 | } |
| 566 | 545 | ||
| 567 | if (message->message == WM_COPYDATA) { | ||
| 568 | COPYDATASTRUCT* pcds = (COPYDATASTRUCT*)(message->lParam); | ||
| 569 | QUrl url = QUrl((const char*)(pcds->lpData)); | ||
| 570 | if (isDomainURL(url)) { | ||
| 571 | DependencyManager::get<AddressManager>()->handleLookupString(url.toString()); | ||
| 572 | return true; | ||
| 573 | } | ||
| 574 | } | ||
| 575 | // Attempting to close MIDI interfaces of a hot-unplugged device can result in audio-driver deadlock. | 546 | // Attempting to close MIDI interfaces of a hot-unplugged device can result in audio-driver deadlock. |
| 576 | // Detecting MIDI devices that have been added/removed after starting Inteface has been disabled. | 547 | // Detecting MIDI devices that have been added/removed after starting Inteface has been disabled. |
| 577 | // https://support.microsoft.com/en-us/help/4460006/midi-device-app-hangs-when-former-midi-api-is-used | 548 | // https://support.microsoft.com/en-us/help/4460006/midi-device-app-hangs-when-former-midi-api-is-used |