History

Rework audio data memory ownership model

Clement committed 8 years ago

Commit 7192aed1 parent 76d251915 files · +347 −260Browse files

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

Unified · Split

libraries/script-engine/src/AudioScriptingInterface.cpp+3−3
@@ -63,15 +63,15 @@ ScriptAudioInjector* AudioScriptingInterface::playSound(SharedSoundPointer sound · 62 unmodified lines
63 optionsCopy.ambisonic = sound->isAmbisonic();63 optionsCopy.ambisonic = sound->isAmbisonic();
64 optionsCopy.localOnly = optionsCopy.localOnly || sound->isAmbisonic(); // force localOnly when Ambisonic64 optionsCopy.localOnly = optionsCopy.localOnly || sound->isAmbisonic(); // force localOnly when Ambisonic
65 65
66 auto injector = AudioInjector::playSound(sound->getByteArray(), optionsCopy);66 auto injector = AudioInjector::playSound(sound, optionsCopy);
67 if (!injector) {67 if (!injector) {
68 return NULL;68 return nullptr;
69 }69 }
70 return new ScriptAudioInjector(injector);70 return new ScriptAudioInjector(injector);
71 71
72 } else {72 } else {
73 qCDebug(scriptengine) << "AudioScriptingInterface::playSound called with null Sound object.";73 qCDebug(scriptengine) << "AudioScriptingInterface::playSound called with null Sound object.";
74 return NULL;74 return nullptr;
75 }75 }
76}76}
77 77