Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all
Unified · Split
| @@ -1182,6 +1182,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1181 unmodified lines | |||
| 1182 | // set the local loopback interface for local sounds | 1182 | // set the local loopback interface for local sounds |
| 1183 | AudioInjector::setLocalAudioInterface(audioIO.data()); | 1183 | AudioInjector::setLocalAudioInterface(audioIO.data()); |
| 1184 | AudioScriptingInterface::getInstance().setLocalAudioInterface(audioIO.data()); | 1184 | AudioScriptingInterface::getInstance().setLocalAudioInterface(audioIO.data()); |
| 1185 | connect(audioIO.data(), &AudioClient::noiseGateOpened, &AudioScriptingInterface::getInstance(), &AudioScriptingInterface::noiseGateOpened); | ||
| 1186 | connect(audioIO.data(), &AudioClient::noiseGateClosed, &AudioScriptingInterface::getInstance(), &AudioScriptingInterface::noiseGateClosed); | ||
| 1187 | connect(audioIO.data(), &AudioClient::inputReceived, &AudioScriptingInterface::getInstance(), &AudioScriptingInterface::inputReceived); | ||
| 1188 | |||
| 1185 | 1189 | ||
| 1186 | this->installEventFilter(this); | 1190 | this->installEventFilter(this); |
| 1187 | 1191 | ||
| @@ -1947,6 +1951,9 @@ void Application::initializeUi() { · 759 unmodified lines | |||
| 1947 | rootContext->setContextProperty("ApplicationInterface", this); | 1951 | rootContext->setContextProperty("ApplicationInterface", this); |
| 1948 | rootContext->setContextProperty("Audio", &AudioScriptingInterface::getInstance()); | 1952 | rootContext->setContextProperty("Audio", &AudioScriptingInterface::getInstance()); |
| 1949 | rootContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data()); | 1953 | rootContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data()); |
| 1954 | //rootContext->setContextProperty("AudioScope", DependencyManager::get<AudioScope>.data()); | ||
| 1955 | |||
| 1956 | |||
| 1950 | rootContext->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data()); | 1957 | rootContext->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data()); |
| 1951 | rootContext->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data()); | 1958 | rootContext->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data()); |
| 1952 | _fileDownload = new FileScriptingInterface(engine); | 1959 | _fileDownload = new FileScriptingInterface(engine); |
| @@ -5521,6 +5528,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 3568 unmodified lines | |||
| 5521 | scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance()); | 5528 | scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance()); |
| 5522 | scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance()); | 5529 | scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance()); |
| 5523 | scriptEngine->registerGlobalObject("AudioStats", DependencyManager::get<AudioClient>()->getStats().data()); | 5530 | scriptEngine->registerGlobalObject("AudioStats", DependencyManager::get<AudioClient>()->getStats().data()); |
| 5531 | scriptEngine->registerGlobalObject("AudioScope", DependencyManager::get<AudioScope>().data()); | ||
| 5524 | 5532 | ||
| 5525 | // Caches | 5533 | // Caches |
| 5526 | scriptEngine->registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data()); | 5534 | scriptEngine->registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data()); |