History

switch bare pointers to AudioInjector objects to be QSharedPointers

Seth Alves committed 9 years ago

Commit 3670a041 parent 4a35ad113 files · +148 −120Browse files

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

Unified · Split

libraries/script-engine/src/ScriptAudioInjector.cpp+3−3
@@ -21,7 +21,7 @@ QScriptValue injectorToScriptValue(QScriptEngine* engine, ScriptAudioInjector* c · 20 unmodified lines
21 // when the script goes down we want to cleanup the injector21 // when the script goes down we want to cleanup the injector
22 QObject::connect(engine, &QScriptEngine::destroyed, in, &ScriptAudioInjector::stopInjectorImmediately,22 QObject::connect(engine, &QScriptEngine::destroyed, in, &ScriptAudioInjector::stopInjectorImmediately,
23 Qt::DirectConnection);23 Qt::DirectConnection);
24 24
25 return engine->newQObject(in, QScriptEngine::ScriptOwnership);25 return engine->newQObject(in, QScriptEngine::ScriptOwnership);
26}26}
27 27
@@ -29,10 +29,10 @@ void injectorFromScriptValue(const QScriptValue& object, ScriptAudioInjector*& o · 1 unmodified line
29 out = qobject_cast<ScriptAudioInjector*>(object.toQObject());29 out = qobject_cast<ScriptAudioInjector*>(object.toQObject());
30}30}
31 31
32ScriptAudioInjector::ScriptAudioInjector(AudioInjector* injector) :32ScriptAudioInjector::ScriptAudioInjector(AudioInjectorPointer injector) :
33 _injector(injector)33 _injector(injector)
34{34{
35 QObject::connect(injector, &AudioInjector::finished, this, &ScriptAudioInjector::finished);35 QObject::connect(injector.data(), &AudioInjector::finished, this, &ScriptAudioInjector::finished);
36}36}
37 37
38ScriptAudioInjector::~ScriptAudioInjector() {38ScriptAudioInjector::~ScriptAudioInjector() {