History

midi in and out

Burt Sloane committed 9 years ago

Commit 7022c401 parent 4b6c13b11 files · +514 −5Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Application.cpp+10−4
@@ -61,6 +61,7 @@ · 60 unmodified lines
6161 #include <AssetClient.h>
6262 #include <AssetUpload.h>
6363 #include <AutoUpdater.h>
64+#include <Midi.h>
6465 #include <AudioInjectorManager.h>
6566 #include <AvatarBookmarks.h>
6667 #include <CursorManager.h>
@@ -395,7 +396,11 @@ public: · 328 unmodified lines
395396 return true;
396397 }
397398 }
398− }
399+
400+ if (message->message == WM_DEVICECHANGE) {
401+ Midi::USBchanged(); // re-scan the MIDI bus
402+ }
403+ }
399404 return false;
400405 }
401406 };
@@ -518,8 +523,9 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 116 unmodified lines
518523 DependencyManager::set<DiscoverabilityManager>();
519524 DependencyManager::set<SceneScriptingInterface>();
520525 DependencyManager::set<OffscreenUi>();
521− DependencyManager::set<AutoUpdater>();
522− DependencyManager::set<PathUtils>();
526+ DependencyManager::set<AutoUpdater>();
527+ DependencyManager::set<Midi>();
528+ DependencyManager::set<PathUtils>();
523529 DependencyManager::set<InterfaceDynamicFactory>();
524530 DependencyManager::set<AudioInjectorManager>();
525531 DependencyManager::set<MessagesClient>();
@@ -640,7 +646,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 114 unmodified lines
640646 _entityClipboard->createRootElement();
641647
642648 #ifdef Q_OS_WIN
643− installNativeEventFilter(&MyNativeEventFilter::getInstance());
649+ installNativeEventFilter(&MyNativeEventFilter::getInstance());
644650 #endif
645651
646652 _logger = new FileLogger(this); // After setting organization name in order to get correct directory

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t