History

Merge pull request #3636 from Atlante45/reverb

Reverb

Philip Rosedale committed 12 years ago

Commit 3ba33542 parents a97b6f1 93a0eb117 files · +546 −13Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+4−0
@@ -17,6 +17,7 @@ · 16 unmodified lines
17#include <QtNetwork/QNetworkReply>17#include <QtNetwork/QNetworkReply>
18#include <QScriptEngine>18#include <QScriptEngine>
19 19
20#include <AudioEffectOptions.h>
20#include <AudioInjector.h>21#include <AudioInjector.h>
21#include <AudioRingBuffer.h>22#include <AudioRingBuffer.h>
22#include <AvatarData.h>23#include <AvatarData.h>
@@ -277,6 +278,9 @@ void ScriptEngine::init() { · 254 unmodified lines
277 278
278 QScriptValue localVoxelsValue = scriptValueFromQMetaObject<LocalVoxels>();279 QScriptValue localVoxelsValue = scriptValueFromQMetaObject<LocalVoxels>();
279 globalObject().setProperty("LocalVoxels", localVoxelsValue);280 globalObject().setProperty("LocalVoxels", localVoxelsValue);
281
282 QScriptValue audioEffectOptionsConstructorValue = newFunction(AudioEffectOptions::constructor);
283 globalObject().setProperty("AudioEffectOptions", audioEffectOptionsConstructorValue);
280 284
281 qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue);285 qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue);
282 qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue);286 qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue);