Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all
Unified · Split
| @@ -61,6 +61,7 @@ · 60 unmodified lines | |||
| 61 | #include <AssetClient.h> | 61 | #include <AssetClient.h> |
| 62 | #include <AssetUpload.h> | 62 | #include <AssetUpload.h> |
| 63 | #include <AutoUpdater.h> | 63 | #include <AutoUpdater.h> |
| 64 | #include <Midi.h> | ||
| 64 | #include <AudioInjectorManager.h> | 65 | #include <AudioInjectorManager.h> |
| 65 | #include <AvatarBookmarks.h> | 66 | #include <AvatarBookmarks.h> |
| 66 | #include <CursorManager.h> | 67 | #include <CursorManager.h> |
| @@ -395,7 +396,11 @@ public: · 328 unmodified lines | |||
| 395 | return true; | 396 | return true; |
| 396 | } | 397 | } |
| 397 | } | 398 | } |
| 398 | } | 399 | |
| 400 | if (message->message == WM_DEVICECHANGE) { | ||
| 401 | Midi::USBchanged(); // re-scan the MIDI bus | ||
| 402 | } | ||
| 403 | } | ||
| 399 | return false; | 404 | return false; |
| 400 | } | 405 | } |
| 401 | }; | 406 | }; |
| @@ -518,8 +523,9 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 116 unmodified lines | |||
| 518 | DependencyManager::set<DiscoverabilityManager>(); | 523 | DependencyManager::set<DiscoverabilityManager>(); |
| 519 | DependencyManager::set<SceneScriptingInterface>(); | 524 | DependencyManager::set<SceneScriptingInterface>(); |
| 520 | DependencyManager::set<OffscreenUi>(); | 525 | DependencyManager::set<OffscreenUi>(); |
| 521 | DependencyManager::set<AutoUpdater>(); | 526 | DependencyManager::set<AutoUpdater>(); |
| 522 | DependencyManager::set<PathUtils>(); | 527 | DependencyManager::set<Midi>(); |
| 528 | DependencyManager::set<PathUtils>(); | ||
| 523 | DependencyManager::set<InterfaceDynamicFactory>(); | 529 | DependencyManager::set<InterfaceDynamicFactory>(); |
| 524 | DependencyManager::set<AudioInjectorManager>(); | 530 | DependencyManager::set<AudioInjectorManager>(); |
| 525 | DependencyManager::set<MessagesClient>(); | 531 | DependencyManager::set<MessagesClient>(); |
| @@ -640,7 +646,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 114 unmodified lines | |||
| 640 | _entityClipboard->createRootElement(); | 646 | _entityClipboard->createRootElement(); |
| 641 | 647 | ||
| 642 | #ifdef Q_OS_WIN | 648 | #ifdef Q_OS_WIN |
| 643 | installNativeEventFilter(&MyNativeEventFilter::getInstance()); | 649 | installNativeEventFilter(&MyNativeEventFilter::getInstance()); |
| 644 | #endif | 650 | #endif |
| 645 | 651 | ||
| 646 | _logger = new FileLogger(this); // After setting organization name in order to get correct directory | 652 | _logger = new FileLogger(this); // After setting organization name in order to get correct directory |