diff options
Diffstat (limited to 'indra/newview/llviewerparcelmedia.h')
-rw-r--r-- | indra/newview/llviewerparcelmedia.h | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h index 790b2b71fc..dadcf74b3e 100644 --- a/indra/newview/llviewerparcelmedia.h +++ b/indra/newview/llviewerparcelmedia.h @@ -5,21 +5,21 @@ * $LicenseInfo:firstyear=2007&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$ */ @@ -39,61 +39,61 @@ class LLViewerParcelMediaNavigationObserver; // do playback. It allows us to remove code from LLViewerParcelMgr. class LLViewerParcelMedia : public LLViewerMediaObserver, public LLSingleton<LLViewerParcelMedia> { - LLSINGLETON(LLViewerParcelMedia); - ~LLViewerParcelMedia(); - LOG_CLASS(LLViewerParcelMedia); + LLSINGLETON(LLViewerParcelMedia); + ~LLViewerParcelMedia(); + LOG_CLASS(LLViewerParcelMedia); public: - void update(LLParcel* parcel); - // called when the agent's parcel has a new URL, or the agent has - // walked on to a new parcel with media + void update(LLParcel* parcel); + // called when the agent's parcel has a new URL, or the agent has + // walked on to a new parcel with media - void play(LLParcel* parcel); - // user clicked play button in media transport controls + void play(LLParcel* parcel); + // user clicked play button in media transport controls - void stop(); - // user clicked stop button in media transport controls + void stop(); + // user clicked stop button in media transport controls - void pause(); - void start(); - // restart after pause - no need for all the setup + void pause(); + void start(); + // restart after pause - no need for all the setup - void focus(bool focus); + void focus(bool focus); - void seek(F32 time); - // jump to timecode time + void seek(F32 time); + // jump to timecode time - LLPluginClassMediaOwner::EMediaStatus getStatus(); - std::string getMimeType(); - std::string getURL(); - std::string getName(); - viewer_media_t getParcelMedia(); - bool hasParcelMedia() { return mMediaImpl.notNull(); } + LLPluginClassMediaOwner::EMediaStatus getStatus(); + std::string getMimeType(); + std::string getURL(); + std::string getName(); + viewer_media_t getParcelMedia(); + bool hasParcelMedia() { return mMediaImpl.notNull(); } - static void parcelMediaCommandMessageHandler( LLMessageSystem *msg, void ** ); - static void parcelMediaUpdateHandler( LLMessageSystem *msg, void ** ); - void sendMediaNavigateMessage(const std::string& url); + static void parcelMediaCommandMessageHandler( LLMessageSystem *msg, void ** ); + static void parcelMediaUpdateHandler( LLMessageSystem *msg, void ** ); + void sendMediaNavigateMessage(const std::string& url); - // inherited from LLViewerMediaObserver - virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override; + // inherited from LLViewerMediaObserver + virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override; private: - void processParcelMediaCommandMessage(LLMessageSystem *msg); - void processParcelMediaUpdate(LLMessageSystem *msg); + void processParcelMediaCommandMessage(LLMessageSystem *msg); + void processParcelMediaUpdate(LLMessageSystem *msg); - S32 mMediaParcelLocalID; - LLUUID mMediaRegionID; - // HACK: this will change with Media on a Prim - viewer_media_t mMediaImpl; + S32 mMediaParcelLocalID; + LLUUID mMediaRegionID; + // HACK: this will change with Media on a Prim + viewer_media_t mMediaImpl; }; class LLViewerParcelMediaNavigationObserver { public: - std::string mCurrentURL; - bool mFromMessage; + std::string mCurrentURL; + bool mFromMessage; - // void onNavigateComplete( const EventType& event_in ); + // void onNavigateComplete( const EventType& event_in ); }; |