diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-12 13:38:17 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-12 13:38:17 -0800 |
| commit | ffd962f3a3eafd7b65f90039a5bb04dccb0205bc (patch) | |
| tree | 9f1674862487a62a8c269ae32f424bb2433000b2 /indra/llaudio/llaudioengine.h | |
| parent | e47dc498e86034a2c991d0add56d522a39354417 (diff) | |
EXT-5267 EXT-5268: Add Parcel Media and Parcel Audio items to nearby media panel
Review #109
This (fairly major) change adds new "items" to the media list for
Parcel Media and Parcel Audio. Since these items are special (before
the items were always MoaP impls), they had to be treated
special. Moreover, actions on all of "media" had to be centralized so
that they would have similar behavior.
Diffstat (limited to 'indra/llaudio/llaudioengine.h')
| -rw-r--r-- | indra/llaudio/llaudioengine.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index 457fd93abe..d287104204 100644 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -91,6 +91,15 @@ public: AUDIO_TYPE_COUNT = 4 // last }; + enum LLAudioPlayState + { + // isInternetStreamPlaying() returns an *int*, with + // 0 = stopped, 1 = playing, 2 = paused. + AUDIO_STOPPED = 0, + AUDIO_PLAYING = 1, + AUDIO_PAUSED = 2 + }; + LLAudioEngine(); virtual ~LLAudioEngine(); @@ -156,7 +165,7 @@ public: void stopInternetStream(); void pauseInternetStream(int pause); void updateInternetStream(); // expected to be called often - int isInternetStreamPlaying(); + LLAudioPlayState isInternetStreamPlaying(); // use a value from 0.0 to 1.0, inclusive void setInternetStreamGain(F32 vol); std::string getInternetStreamURL(); |
