Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:22:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2816 from birarda/stop-sound

Browse source 
add interface to Audio to stop injector and see if playing
This commit is contained in:
Philip Rosedale 2014-05-07 20:59:58 -07:00
commit 6762d4d63c
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/audio/src/AudioScriptingInterface.cpp
View file

@ -32,6 +32,16 @@ AudioInjector* AudioScriptingInterface::playSound(Sound* sound, const AudioInjec
return injector; 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, void AudioScriptingInterface::startDrumSound(float volume, float frequency, float duration, float decay,
const AudioInjectorOptions* injectorOptions) { const AudioInjectorOptions* injectorOptions) {

2
libraries/audio/src/AudioScriptingInterface.h
View file

@ -21,6 +21,8 @@ class AudioScriptingInterface : public QObject {
Q_OBJECT Q_OBJECT
public slots: public slots:
static AudioInjector* playSound(Sound* sound, const AudioInjectorOptions* injectorOptions = NULL); 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, static void startDrumSound(float volume, float frequency, float duration, float decay,
const AudioInjectorOptions* injectorOptions = NULL); const AudioInjectorOptions* injectorOptions = NULL);