diff options
author | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-18 13:29:25 -0700 |
---|---|---|
committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-18 13:29:25 -0700 |
commit | e9921e77b0a6c66855204db82d56de7925651a4d (patch) | |
tree | 510e353b4e773e18f95bd7312c813189f947dbb6 /indra/llaudio/llaudioengine.h | |
parent | efb9df04c3899c269f0c17d2473b4472d5f31ee5 (diff) | |
parent | d031662435d97101411ae990ed85d6e001ab668a (diff) |
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
Diffstat (limited to 'indra/llaudio/llaudioengine.h')
-rw-r--r-- | indra/llaudio/llaudioengine.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index 577b36d667..b5fd4c27a1 100644 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -304,7 +304,13 @@ public: LLAudioBuffer *getCurrentBuffer(); bool setupChannel(); - bool play(const LLUUID &audio_id); // Start the audio source playing + + // Stop the audio source, reset audio id even if muted + void stop(); + + // Start the audio source playing, + // takes mute into account to preserve previous id if nessesary + bool play(const LLUUID &audio_id); bool hasPendingPreloads() const; // Has preloads that haven't been done yet |