diff options
author | McCabe Maxsted | 2009-02-18 04:01:36 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-02-18 04:01:36 -0700 |
commit | 551d8a6c8531ff6fbdf0e3e5fe32e943b6eec1d9 (patch) | |
tree | 0108099950ecc5eab7f061f3f5d2233d9056ca6b /linden | |
parent | Merge commit 'mccabe/next' into next (diff) | |
download | meta-impy-551d8a6c8531ff6fbdf0e3e5fe32e943b6eec1d9.zip meta-impy-551d8a6c8531ff6fbdf0e3e5fe32e943b6eec1d9.tar.gz meta-impy-551d8a6c8531ff6fbdf0e3e5fe32e943b6eec1d9.tar.bz2 meta-impy-551d8a6c8531ff6fbdf0e3e5fe32e943b6eec1d9.tar.xz |
Fixed some bad comment formatting
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/llaudio/audioengine.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp index da9bcba..3a079f1 100644 --- a/linden/indra/llaudio/audioengine.cpp +++ b/linden/indra/llaudio/audioengine.cpp | |||
@@ -186,14 +186,17 @@ void LLAudioEngine::startInternetStream(const std::string& url) | |||
186 | if(!mInternetStreamMedia) | 186 | if(!mInternetStreamMedia) |
187 | return; | 187 | return; |
188 | 188 | ||
189 | if (!url.empty()) { | 189 | if (!url.empty()) |
190 | { | ||
190 | LL_INFOS("AudioEngine") << "Starting internet stream: " << url << llendl; | 191 | LL_INFOS("AudioEngine") << "Starting internet stream: " << url << llendl; |
191 | mInternetStreamURL = url; | 192 | mInternetStreamURL = url; |
192 | mInternetStreamMedia->navigateTo ( url ); | 193 | mInternetStreamMedia->navigateTo ( url ); |
193 | LL_INFOS("AudioEngine") << "Playing....." << llendl; | 194 | LL_INFOS("AudioEngine") << "Playing....." << llendl; |
194 | mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START); | 195 | mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START); |
195 | mInternetStreamMedia->updateMedia(); | 196 | mInternetStreamMedia->updateMedia(); |
196 | } else { | 197 | } |
198 | else | ||
199 | { | ||
197 | LL_INFOS("AudioEngine") << "setting stream to NULL"<< llendl; | 200 | LL_INFOS("AudioEngine") << "setting stream to NULL"<< llendl; |
198 | mInternetStreamURL.clear(); | 201 | mInternetStreamURL.clear(); |
199 | mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP); | 202 | mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP); |
@@ -207,9 +210,10 @@ void LLAudioEngine::stopInternetStream() | |||
207 | { | 210 | { |
208 | LL_INFOS("AudioEngine") << "entered stopInternetStream()" << llendl; | 211 | LL_INFOS("AudioEngine") << "entered stopInternetStream()" << llendl; |
209 | 212 | ||
210 | if(mInternetStreamMedia) | 213 | if(mInternetStreamMedia) |
211 | { | 214 | { |
212 | if( ! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP)){ | 215 | if(!mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP)) |
216 | { | ||
213 | LL_INFOS("AudioEngine") << "attempting to stop stream failed!" << llendl; | 217 | LL_INFOS("AudioEngine") << "attempting to stop stream failed!" << llendl; |
214 | } | 218 | } |
215 | mInternetStreamMedia->updateMedia(); | 219 | mInternetStreamMedia->updateMedia(); |
@@ -232,7 +236,9 @@ void LLAudioEngine::pauseInternetStream(int pause) | |||
232 | { | 236 | { |
233 | LL_INFOS("AudioEngine") << "attempting to pause stream failed!" << llendl; | 237 | LL_INFOS("AudioEngine") << "attempting to pause stream failed!" << llendl; |
234 | } | 238 | } |
235 | } else { | 239 | } |
240 | else | ||
241 | { | ||
236 | if(! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START)) | 242 | if(! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START)) |
237 | { | 243 | { |
238 | LL_INFOS("AudioEngine") << "attempting to unpause stream failed!" << llendl; | 244 | LL_INFOS("AudioEngine") << "attempting to unpause stream failed!" << llendl; |