History

changes to allow AudioInjectorOptions to operate as a hash from js

Stephen Birarda committed 12 years ago

Commit a8681cd1 parent d083e757 files · +85 −89Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 7 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−4
@@ -234,7 +234,6 @@ bool ScriptEngine::setScriptContents(const QString& scriptContents, const QStrin · 233 unmodified lines
234234 return true;
235235 }
236236
237−Q_SCRIPT_DECLARE_QMETAOBJECT(AudioInjectorOptions, QObject*)
238237 Q_SCRIPT_DECLARE_QMETAOBJECT(LocalVoxels, QString)
239238
240239 void ScriptEngine::init() {
@@ -254,6 +253,7 @@ void ScriptEngine::init() { · 13 unmodified lines
254253 registerMenuItemProperties(this);
255254 registerAnimationTypes(this);
256255 registerAvatarTypes(this);
256+ registerAudioMetaTypes(this);
257257 Bitstream::registerTypes(this);
258258
259259 qScriptRegisterMetaType(this, EntityItemPropertiesToScriptValue, EntityItemPropertiesFromScriptValue);
@@ -275,9 +275,6 @@ void ScriptEngine::init() { · 15 unmodified lines
275275 QScriptValue soundMetaObject = newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);
276276 globalObject().setProperty("Sound", soundMetaObject);
277277
278− QScriptValue injectionOptionValue = scriptValueFromQMetaObject<AudioInjectorOptions>();
279− globalObject().setProperty("AudioInjectionOptions", injectionOptionValue);
280−
281278 QScriptValue localVoxelsValue = scriptValueFromQMetaObject<LocalVoxels>();
282279 globalObject().setProperty("LocalVoxels", localVoxelsValue);
283280