History

Merge pull request #10711 from burtsloane/midi

Midi support for Entities

Andrew Meadows committed 9 years ago

Commit d4e72df2 parents f407bf6 e557f7512 files · +466 −6Browse files

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

Unified · Split

interface/src/Application.cpp+6−0
@@ -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>
@@ -398,6 +399,10 @@ public: · 331 unmodified lines
398399 return true;
399400 }
400401 }
402+
403+ if (message->message == WM_DEVICECHANGE) {
404+ Midi::USBchanged(); // re-scan the MIDI bus
405+ }
401406 }
402407 return false;
403408 }
@@ -567,6 +572,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 163 unmodified lines
567572 DependencyManager::set<SceneScriptingInterface>();
568573 DependencyManager::set<OffscreenUi>();
569574 DependencyManager::set<AutoUpdater>();
575+ DependencyManager::set<Midi>();
570576 DependencyManager::set<PathUtils>();
571577 DependencyManager::set<InterfaceDynamicFactory>();
572578 DependencyManager::set<AudioInjectorManager>();