Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -3766,6 +3766,14 @@ void Application::saveScripts() { · 3765 unmodified lines | |||
| 3766 | _settings->endArray(); | 3766 | _settings->endArray(); |
| 3767 | } | 3767 | } |
| 3768 | 3768 | ||
| 3769 | QScriptValue joystickToScriptValue(QScriptEngine *engine, Joystick* const &in) { | ||
| 3770 | return engine->newQObject(in); | ||
| 3771 | } | ||
| 3772 | |||
| 3773 | void joystickFromScriptValue(const QScriptValue &object, Joystick* &out) { | ||
| 3774 | out = qobject_cast<Joystick*>(object.toQObject()); | ||
| 3775 | } | ||
| 3776 | |||
| 3769 | ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUserLoaded, | 3777 | ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUserLoaded, |
| 3770 | bool loadScriptFromEditor, bool activateMainWindow) { | 3778 | bool loadScriptFromEditor, bool activateMainWindow) { |
| 3771 | QUrl scriptUrl(scriptFilename); | 3779 | QUrl scriptUrl(scriptFilename); |
| @@ -3850,6 +3858,7 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser · 78 unmodified lines | |||
| 3850 | scriptEngine->registerGlobalObject("AvatarManager", &_avatarManager); | 3858 | scriptEngine->registerGlobalObject("AvatarManager", &_avatarManager); |
| 3851 | 3859 | ||
| 3852 | scriptEngine->registerGlobalObject("Joysticks", &JoystickScriptingInterface::getInstance()); | 3860 | scriptEngine->registerGlobalObject("Joysticks", &JoystickScriptingInterface::getInstance()); |
| 3861 | qScriptRegisterMetaType(scriptEngine, joystickToScriptValue, joystickFromScriptValue); | ||
| 3853 | 3862 | ||
| 3854 | #ifdef HAVE_RTMIDI | 3863 | #ifdef HAVE_RTMIDI |
| 3855 | scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance()); | 3864 | scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance()); |