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
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>
@@ -398,6 +399,10 @@ public: · 331 unmodified lines
398 return true;399 return true;
399 }400 }
400 }401 }
402
403 if (message->message == WM_DEVICECHANGE) {
404 Midi::USBchanged(); // re-scan the MIDI bus
405 }
401 }406 }
402 return false;407 return false;
403 }408 }
@@ -567,6 +572,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 163 unmodified lines
567 DependencyManager::set<SceneScriptingInterface>();572 DependencyManager::set<SceneScriptingInterface>();
568 DependencyManager::set<OffscreenUi>();573 DependencyManager::set<OffscreenUi>();
569 DependencyManager::set<AutoUpdater>();574 DependencyManager::set<AutoUpdater>();
575 DependencyManager::set<Midi>();
570 DependencyManager::set<PathUtils>();576 DependencyManager::set<PathUtils>();
571 DependencyManager::set<InterfaceDynamicFactory>();577 DependencyManager::set<InterfaceDynamicFactory>();
572 DependencyManager::set<AudioInjectorManager>();578 DependencyManager::set<AudioInjectorManager>();