diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-12 14:47:51 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-12 14:47:51 -0800 |
| commit | 9cc4eccac58923566f76b9d10c4f478889d26c28 (patch) | |
| tree | 3edc65dd0a09c48628f3c6645a18b58d8144e115 /indra/llaudio/llaudioengine.cpp | |
| parent | 9f3c3d8f64be7c7321f6037dcd78234417c0a2d8 (diff) | |
| parent | ffd962f3a3eafd7b65f90039a5bb04dccb0205bc (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses
Diffstat (limited to 'indra/llaudio/llaudioengine.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index a28c94d00d..ed06c85e1a 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -202,12 +202,12 @@ void LLAudioEngine::updateInternetStream() } // virtual -int LLAudioEngine::isInternetStreamPlaying() +LLAudioEngine::LLAudioPlayState LLAudioEngine::isInternetStreamPlaying() { if (mStreamingAudioImpl) - return mStreamingAudioImpl->isPlaying(); + return (LLAudioEngine::LLAudioPlayState) mStreamingAudioImpl->isPlaying(); - return 0; // Stopped + return LLAudioEngine::AUDIO_STOPPED; // Stopped } |