History

avoid Qt QTimer thread bug by putting SoundCache on same thread

Stephen Birarda committed 11 years ago

Commit e10d1321 parent a771f7211 files · +74 −61Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+0−13
@@ -27,7 +27,6 @@ · 26 unmodified lines
27#include <NetworkAccessManager.h>27#include <NetworkAccessManager.h>
28#include <NodeList.h>28#include <NodeList.h>
29#include <PacketHeaders.h>29#include <PacketHeaders.h>
30#include <Sound.h>
31#include <UUID.h>30#include <UUID.h>
32#include <VoxelConstants.h>31#include <VoxelConstants.h>
33#include <VoxelDetail.h>32#include <VoxelDetail.h>
@@ -47,14 +46,6 @@ · 13 unmodified lines
47VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface;46VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface;
48EntityScriptingInterface ScriptEngine::_entityScriptingInterface;47EntityScriptingInterface ScriptEngine::_entityScriptingInterface;
49 48
50static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* engine) {
51 QUrl soundURL = QUrl(context->argument(0).toString());
52 bool isStereo = context->argument(1).toBool();
53 QScriptValue soundScriptValue = engine->newQObject(new Sound(soundURL, isStereo), QScriptEngine::ScriptOwnership);
54
55 return soundScriptValue;
56}
57
58static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){49static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){
59 qDebug() << "script:print()<<" << context->argument(0).toString();50 qDebug() << "script:print()<<" << context->argument(0).toString();
60 QString message = context->argument(0).toString()51 QString message = context->argument(0).toString()
@@ -263,10 +254,6 @@ void ScriptEngine::init() { · 202 unmodified lines
263 QScriptValue printConstructorValue = newFunction(debugPrint);254 QScriptValue printConstructorValue = newFunction(debugPrint);
264 globalObject().setProperty("print", printConstructorValue);255 globalObject().setProperty("print", printConstructorValue);
265 256
266 QScriptValue soundConstructorValue = newFunction(soundConstructor);
267 QScriptValue soundMetaObject = newQMetaObject(&Sound::staticMetaObject, soundConstructorValue);
268 globalObject().setProperty("Sound", soundMetaObject);
269
270 QScriptValue localVoxelsValue = scriptValueFromQMetaObject<LocalVoxels>();257 QScriptValue localVoxelsValue = scriptValueFromQMetaObject<LocalVoxels>();
271 globalObject().setProperty("LocalVoxels", localVoxelsValue);258 globalObject().setProperty("LocalVoxels", localVoxelsValue);
272 259