diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:07:21 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:07:21 -0400 |
commit | 5d43bc166d011e911e0492579b2f4f8bf015b48f (patch) | |
tree | ccc4cda5c2c2c3a5689f4a33dcfda2a896f21b8c /indra/newview/llvieweraudio.h | |
parent | a3f2cacf542e1d770698ef6c7e6ea1c0a5cd3368 (diff) | |
parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) |
Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.
Diffstat (limited to 'indra/newview/llvieweraudio.h')
-rw-r--r-- | indra/newview/llvieweraudio.h | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/indra/newview/llvieweraudio.h b/indra/newview/llvieweraudio.h index febae36ae8..827b14f4de 100644 --- a/indra/newview/llvieweraudio.h +++ b/indra/newview/llvieweraudio.h @@ -1,25 +1,25 @@ -/** +/** * @file llvieweraudio.h * @brief Audio functions that used to be in viewer.cpp * * $LicenseInfo:firstyear=2002&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -31,8 +31,8 @@ #include "llsingleton.h" // comment out to turn off wind -#define kAUDIO_ENABLE_WIND -//#define kAUDIO_ENABLE_WATER 1 // comment out to turn off water +#define kAUDIO_ENABLE_WIND +//#define kAUDIO_ENABLE_WATER 1 // comment out to turn off water void init_audio(); void audio_update_volume(bool force_update = true); @@ -41,52 +41,52 @@ void audio_update_wind(bool force_update = true); class LLViewerAudio : public LLSingleton<LLViewerAudio> { - LLSINGLETON(LLViewerAudio); - virtual ~LLViewerAudio(); + LLSINGLETON(LLViewerAudio); + virtual ~LLViewerAudio(); public: - enum EFadeState - { - FADE_IDLE, - FADE_IN, - FADE_OUT, - }; + enum EFadeState + { + FADE_IDLE, + FADE_IN, + FADE_OUT, + }; + + void startInternetStreamWithAutoFade(const std::string &streamURI); + void stopInternetStreamWithAutoFade(); - void startInternetStreamWithAutoFade(const std::string &streamURI); - void stopInternetStreamWithAutoFade(); - - bool onIdleUpdate(); + bool onIdleUpdate(); - EFadeState getFadeState() { return mFadeState; } - bool isDone() { return mDone; }; - F32 getFadeVolume(); - bool getForcedTeleportFade() { return mForcedTeleportFade; }; - void setForcedTeleportFade(bool fade) { mForcedTeleportFade = fade;} ; - std::string getNextStreamURI() { return mNextStreamURI; }; - void setNextStreamURI(const std::string &stream) { mNextStreamURI = stream; } ; - void setWasPlaying(bool playing) { mWasPlaying = playing;} ; + EFadeState getFadeState() { return mFadeState; } + bool isDone() { return mDone; }; + F32 getFadeVolume(); + bool getForcedTeleportFade() { return mForcedTeleportFade; }; + void setForcedTeleportFade(bool fade) { mForcedTeleportFade = fade;} ; + std::string getNextStreamURI() { return mNextStreamURI; }; + void setNextStreamURI(const std::string &stream) { mNextStreamURI = stream; } ; + void setWasPlaying(bool playing) { mWasPlaying = playing;} ; private: - bool mDone; - F32 mFadeTime; - std::string mNextStreamURI; - EFadeState mFadeState; - LLFrameTimer stream_fade_timer; - bool mIdleListnerActive; - bool mForcedTeleportFade; - bool mWasPlaying; - boost::signals2::connection mTeleportFailedConnection; - boost::signals2::connection mTeleportFinishedConnection; - boost::signals2::connection mTeleportStartedConnection; + bool mDone; + F32 mFadeTime; + std::string mNextStreamURI; + EFadeState mFadeState; + LLFrameTimer stream_fade_timer; + bool mIdleListnerActive; + bool mForcedTeleportFade; + bool mWasPlaying; + boost::signals2::connection mTeleportFailedConnection; + boost::signals2::connection mTeleportFinishedConnection; + boost::signals2::connection mTeleportStartedConnection; - void registerIdleListener(); - void deregisterIdleListener() { mIdleListnerActive = false; }; - void startFading(); - void onTeleportFailed(); - void onTeleportFinished(const LLVector3d& pos, const bool& local); - void onTeleportStarted(); + void registerIdleListener(); + void deregisterIdleListener() { mIdleListnerActive = false; }; + void startFading(); + void onTeleportFailed(); + void onTeleportFinished(const LLVector3d& pos, const bool& local); + void onTeleportStarted(); }; #endif //LL_VIEWER_H |