diff options
Diffstat (limited to 'indra/newview/llviewermedia_streamingaudio.cpp')
| -rw-r--r-- | indra/newview/llviewermedia_streamingaudio.cpp | 168 |
1 files changed, 84 insertions, 84 deletions
diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp index d3e24aece5..af3a21c183 100644 --- a/indra/newview/llviewermedia_streamingaudio.cpp +++ b/indra/newview/llviewermedia_streamingaudio.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llviewermedia_streamingaudio.h * @author Tofu Linden, Sam Kolb * @brief LLStreamingAudio_MediaPlugins implementation - an implementation of the streaming audio interface which is implemented as a client of the media plugin API. @@ -6,21 +6,21 @@ * $LicenseInfo:firstyear=2009&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$ */ @@ -36,130 +36,130 @@ #include "lldir.h" LLStreamingAudio_MediaPlugins::LLStreamingAudio_MediaPlugins() : - mMediaPlugin(NULL), - mGain(1.0) + mMediaPlugin(NULL), + mGain(1.0) { - // nothing interesting to do? - // we will lazily create a media plugin at play-time, if none exists. + // nothing interesting to do? + // we will lazily create a media plugin at play-time, if none exists. } LLStreamingAudio_MediaPlugins::~LLStreamingAudio_MediaPlugins() { - delete mMediaPlugin; - mMediaPlugin = NULL; + delete mMediaPlugin; + mMediaPlugin = NULL; } void LLStreamingAudio_MediaPlugins::start(const std::string& url) { - if (!mMediaPlugin) // lazy-init the underlying media plugin - { - mMediaPlugin = initializeMedia("audio/mpeg"); // assumes that whatever media implementation supports mp3 also supports vorbis. - LL_INFOS() << "streaming audio mMediaPlugin is now " << mMediaPlugin << LL_ENDL; - } - - if(!mMediaPlugin) - return; - - if (!url.empty()) { - LL_INFOS() << "Starting internet stream: " << url << LL_ENDL; - mURL = url; - mMediaPlugin->loadURI ( url ); - mMediaPlugin->start(); - LL_INFOS() << "Playing stream..." << LL_ENDL; - } else { - LL_INFOS() << "setting stream to NULL"<< LL_ENDL; - mURL.clear(); - mMediaPlugin->stop(); - } + if (!mMediaPlugin) // lazy-init the underlying media plugin + { + mMediaPlugin = initializeMedia("audio/mpeg"); // assumes that whatever media implementation supports mp3 also supports vorbis. + LL_INFOS() << "streaming audio mMediaPlugin is now " << mMediaPlugin << LL_ENDL; + } + + if(!mMediaPlugin) + return; + + if (!url.empty()) { + LL_INFOS() << "Starting internet stream: " << url << LL_ENDL; + mURL = url; + mMediaPlugin->loadURI ( url ); + mMediaPlugin->start(); + LL_INFOS() << "Playing stream..." << LL_ENDL; + } else { + LL_INFOS() << "setting stream to NULL"<< LL_ENDL; + mURL.clear(); + mMediaPlugin->stop(); + } } void LLStreamingAudio_MediaPlugins::stop() { - LL_INFOS() << "Stopping internet stream." << LL_ENDL; - if(mMediaPlugin) - { - mMediaPlugin->stop(); - } + LL_INFOS() << "Stopping internet stream." << LL_ENDL; + if(mMediaPlugin) + { + mMediaPlugin->stop(); + } - mURL.clear(); + mURL.clear(); } void LLStreamingAudio_MediaPlugins::pause(int pause) { - if(!mMediaPlugin) - return; - - if(pause) - { - LL_INFOS() << "Pausing internet stream." << LL_ENDL; - mMediaPlugin->pause(); - } - else - { - LL_INFOS() << "Unpausing internet stream." << LL_ENDL; - mMediaPlugin->start(); - } + if(!mMediaPlugin) + return; + + if(pause) + { + LL_INFOS() << "Pausing internet stream." << LL_ENDL; + mMediaPlugin->pause(); + } + else + { + LL_INFOS() << "Unpausing internet stream." << LL_ENDL; + mMediaPlugin->start(); + } } void LLStreamingAudio_MediaPlugins::update() { - if (mMediaPlugin) - mMediaPlugin->idle(); + if (mMediaPlugin) + mMediaPlugin->idle(); } int LLStreamingAudio_MediaPlugins::isPlaying() { - if (!mMediaPlugin) - return 0; // stopped - - LLPluginClassMediaOwner::EMediaStatus status = - mMediaPlugin->getStatus(); - - switch (status) - { - case LLPluginClassMediaOwner::MEDIA_LOADING: // but not MEDIA_LOADED - case LLPluginClassMediaOwner::MEDIA_PLAYING: - return 1; // Active and playing - case LLPluginClassMediaOwner::MEDIA_PAUSED: - return 2; // paused - default: - return 0; // stopped - } + if (!mMediaPlugin) + return 0; // stopped + + LLPluginClassMediaOwner::EMediaStatus status = + mMediaPlugin->getStatus(); + + switch (status) + { + case LLPluginClassMediaOwner::MEDIA_LOADING: // but not MEDIA_LOADED + case LLPluginClassMediaOwner::MEDIA_PLAYING: + return 1; // Active and playing + case LLPluginClassMediaOwner::MEDIA_PAUSED: + return 2; // paused + default: + return 0; // stopped + } } void LLStreamingAudio_MediaPlugins::setGain(F32 vol) { - mGain = vol; + mGain = vol; - if(!mMediaPlugin) - return; + if(!mMediaPlugin) + return; - vol = llclamp(vol, 0.f, 1.f); - mMediaPlugin->setVolume(vol); + vol = llclamp(vol, 0.f, 1.f); + mMediaPlugin->setVolume(vol); } F32 LLStreamingAudio_MediaPlugins::getGain() { - return mGain; + return mGain; } std::string LLStreamingAudio_MediaPlugins::getURL() { - return mURL; + return mURL; } LLPluginClassMedia* LLStreamingAudio_MediaPlugins::initializeMedia(const std::string& media_type) { - LLPluginClassMediaOwner* owner = NULL; - S32 default_size = 1; // audio-only - be minimal, doesn't matter - F64 default_zoom = 1.0; - LLPluginClassMedia* media_source = LLViewerMediaImpl::newSourceFromMediaType(media_type, owner, default_size, default_size, default_zoom); + LLPluginClassMediaOwner* owner = NULL; + S32 default_size = 1; // audio-only - be minimal, doesn't matter + F64 default_zoom = 1.0; + LLPluginClassMedia* media_source = LLViewerMediaImpl::newSourceFromMediaType(media_type, owner, default_size, default_size, default_zoom); - if (media_source) - { - media_source->setLoop(false); // audio streams are not expected to loop - } + if (media_source) + { + media_source->setLoop(false); // audio streams are not expected to loop + } - return media_source; + return media_source; } |