diff options
Diffstat (limited to 'linden/indra/newview/lloverlaybar.cpp')
-rw-r--r-- | linden/indra/newview/lloverlaybar.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp index 4e1d03e..93b73c7 100644 --- a/linden/indra/newview/lloverlaybar.cpp +++ b/linden/indra/newview/lloverlaybar.cpp | |||
@@ -383,6 +383,23 @@ void LLOverlayBar::onClickStandUp(void*) | |||
383 | } | 383 | } |
384 | 384 | ||
385 | //////////////////////////////////////////////////////////////////////////////// | 385 | //////////////////////////////////////////////////////////////////////////////// |
386 | void LLOverlayBar::audioFilterPlay() | ||
387 | { | ||
388 | if (gOverlayBar && gOverlayBar->mMusicState != PLAYING) | ||
389 | { | ||
390 | gOverlayBar->mMusicState = PLAYING; | ||
391 | } | ||
392 | } | ||
393 | |||
394 | void LLOverlayBar::audioFilterStop() | ||
395 | { | ||
396 | if (gOverlayBar && gOverlayBar->mMusicState != STOPPED) | ||
397 | { | ||
398 | gOverlayBar->mMusicState = STOPPED; | ||
399 | } | ||
400 | } | ||
401 | |||
402 | //////////////////////////////////////////////////////////////////////////////// | ||
386 | // static media helpers | 403 | // static media helpers |
387 | // *TODO: Move this into an audio manager abstraction | 404 | // *TODO: Move this into an audio manager abstraction |
388 | //static | 405 | //static |
@@ -416,6 +433,7 @@ void LLOverlayBar::toggleMediaPlay(void*) | |||
416 | LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); | 433 | LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); |
417 | if (parcel) | 434 | if (parcel) |
418 | { | 435 | { |
436 | LLViewerParcelMedia::sIsUserAction = true; | ||
419 | LLViewerParcelMedia::play(parcel); | 437 | LLViewerParcelMedia::play(parcel); |
420 | } | 438 | } |
421 | } | 439 | } |
@@ -447,7 +465,8 @@ void LLOverlayBar::toggleMusicPlay(void*) | |||
447 | // stream is stopped, it doesn't return the right thing - commenting out for now. | 465 | // stream is stopped, it doesn't return the right thing - commenting out for now. |
448 | // if ( gAudioStream->isInternetStreamPlaying() == 0 ) | 466 | // if ( gAudioStream->isInternetStreamPlaying() == 0 ) |
449 | { | 467 | { |
450 | gAudioStream->startInternetStream(parcel->getMusicURL()); | 468 | LLViewerParcelMedia::sIsUserAction = true; |
469 | LLViewerParcelMedia::playStreamingMusic(parcel); | ||
451 | } | 470 | } |
452 | } | 471 | } |
453 | } | 472 | } |