History

Put the common stuff on AudioInjector rather than AudioClient, so that assignment-client (which depends on script-engine) does not need to depend on audio-client.

Howard Stearns committed 11 years ago

Commit dc10e151 parent 37d6e218 files · +83 −79Browse files

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

Unified · Split

libraries/script-engine/src/AudioScriptingInterface.cpp+1−2
@@ -11,7 +11,6 @@ · 10 unmodified lines
11 11
12#include "AudioScriptingInterface.h"12#include "AudioScriptingInterface.h"
13 13
14#include "AudioClient.h"
15#include "ScriptAudioInjector.h"14#include "ScriptAudioInjector.h"
16#include "ScriptEngineLogging.h"15#include "ScriptEngineLogging.h"
17 16
@@ -47,7 +46,7 @@ ScriptAudioInjector* AudioScriptingInterface::playSound(Sound* sound, const Audi · 29 unmodified lines
47 AudioInjectorOptions optionsCopy = injectorOptions;46 AudioInjectorOptions optionsCopy = injectorOptions;
48 optionsCopy.stereo = sound->isStereo();47 optionsCopy.stereo = sound->isStereo();
49 48
50 return new ScriptAudioInjector(DependencyManager::get<AudioClient>()->playSound(sound->getByteArray(), optionsCopy));49 return new ScriptAudioInjector(AudioInjector::playSound(sound->getByteArray(), optionsCopy, _localAudioInterface));
51 50
52 } else {51 } else {
53 qCDebug(scriptengine) << "AudioScriptingInterface::playSound called with null Sound object.";52 qCDebug(scriptengine) << "AudioScriptingInterface::playSound called with null Sound object.";