From f78c81e073e3dd2cf247beb794c3f39734602e60 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 7 May 2014 17:48:01 -0700 Subject: [PATCH] add interface to Audio to stop injector and see if playing --- libraries/audio/src/AudioScriptingInterface.cpp | 10 ++++++++++ libraries/audio/src/AudioScriptingInterface.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/libraries/audio/src/AudioScriptingInterface.cpp b/libraries/audio/src/AudioScriptingInterface.cpp index 944ae49adf..fa0d3a9565 100644 --- a/libraries/audio/src/AudioScriptingInterface.cpp +++ b/libraries/audio/src/AudioScriptingInterface.cpp @@ -32,6 +32,16 @@ AudioInjector* AudioScriptingInterface::playSound(Sound* sound, const AudioInjec return injector; } +void AudioScriptingInterface::stopInjector(AudioInjector* injector) { + if (injector) { + injector->stop(); + } +} + +bool AudioScriptingInterface::isInjectorPlaying(AudioInjector* injector) { + return (injector != NULL); +} + void AudioScriptingInterface::startDrumSound(float volume, float frequency, float duration, float decay, const AudioInjectorOptions* injectorOptions) { diff --git a/libraries/audio/src/AudioScriptingInterface.h b/libraries/audio/src/AudioScriptingInterface.h index de8e57090a..343eac304c 100644 --- a/libraries/audio/src/AudioScriptingInterface.h +++ b/libraries/audio/src/AudioScriptingInterface.h @@ -21,6 +21,8 @@ class AudioScriptingInterface : public QObject { Q_OBJECT public slots: static AudioInjector* playSound(Sound* sound, const AudioInjectorOptions* injectorOptions = NULL); + static void stopInjector(AudioInjector* injector); + static bool isInjectorPlaying(AudioInjector* injector); static void startDrumSound(float volume, float frequency, float duration, float decay, const AudioInjectorOptions* injectorOptions = NULL);