diff options
author | Armin Weatherwax | 2011-01-04 00:25:35 +0100 |
---|---|---|
committer | Armin Weatherwax | 2011-01-04 00:36:19 +0100 |
commit | b4959214023db77c6048036cc924075c4271ba74 (patch) | |
tree | bfc899fae639c2187088d3802e2404a7d689ed88 /linden/indra/newview/llviewermedia_streamingaudio.h | |
parent | load unloaded-avatar-cloud particle system from LLSD file. (diff) | |
download | meta-impy-b4959214023db77c6048036cc924075c4271ba74.zip meta-impy-b4959214023db77c6048036cc924075c4271ba74.tar.gz meta-impy-b4959214023db77c6048036cc924075c4271ba74.tar.bz2 meta-impy-b4959214023db77c6048036cc924075c4271ba74.tar.xz |
move streaming audio out of gAudiop into its own class.
* might solve several issues with streaming audio, like:
streaming audio not working when the sound effects driver fails.
* breaks fmod. Sorry. If you want fmod go fix it, its probably not difficult.
Diffstat (limited to 'linden/indra/newview/llviewermedia_streamingaudio.h')
-rw-r--r-- | linden/indra/newview/llviewermedia_streamingaudio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermedia_streamingaudio.h b/linden/indra/newview/llviewermedia_streamingaudio.h index 816e213..5802a31 100644 --- a/linden/indra/newview/llviewermedia_streamingaudio.h +++ b/linden/indra/newview/llviewermedia_streamingaudio.h | |||
@@ -56,6 +56,7 @@ class LLStreamingAudio_MediaPlugins : | |||
56 | /*virtual*/ void setGain(F32 vol); | 56 | /*virtual*/ void setGain(F32 vol); |
57 | /*virtual*/ F32 getGain(); | 57 | /*virtual*/ F32 getGain(); |
58 | /*virtual*/ std::string getURL(); | 58 | /*virtual*/ std::string getURL(); |
59 | /*virtual*/ std::string getVersion(); | ||
59 | 60 | ||
60 | // inherited from LLPluginClassMediaOwner | 61 | // inherited from LLPluginClassMediaOwner |
61 | /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); | 62 | /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); |
@@ -66,6 +67,7 @@ private: | |||
66 | LLPluginClassMedia *mMediaPlugin; | 67 | LLPluginClassMedia *mMediaPlugin; |
67 | std::string mURL; | 68 | std::string mURL; |
68 | F32 mGain; | 69 | F32 mGain; |
70 | std::string mVersion; | ||
69 | }; | 71 | }; |
70 | 72 | ||
71 | 73 | ||