aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llaudio/audioengine.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-02-20 15:33:07 -0700
committerMcCabe Maxsted2009-02-20 15:33:07 -0700
commit829e1b311f5fdd3c19d812b14cccf1175ddf6dc6 (patch)
tree148792be99dc308a5a95b1b50705e17a81a8565d /linden/indra/llaudio/audioengine.h
parentUpdated GStreamer comments (diff)
downloadmeta-impy-829e1b311f5fdd3c19d812b14cccf1175ddf6dc6.zip
meta-impy-829e1b311f5fdd3c19d812b14cccf1175ddf6dc6.tar.gz
meta-impy-829e1b311f5fdd3c19d812b14cccf1175ddf6dc6.tar.bz2
meta-impy-829e1b311f5fdd3c19d812b14cccf1175ddf6dc6.tar.xz
Added STATUS_DEAD to LLMediaBase
Diffstat (limited to '')
-rw-r--r--linden/indra/llaudio/audioengine.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index 15cb35f..878a96a 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -45,6 +45,8 @@
45#include "llframetimer.h" 45#include "llframetimer.h"
46#include "llassettype.h" 46#include "llassettype.h"
47 47
48#include "llmediabase.h"
49
48class LLMediaBase; 50class LLMediaBase;
49 51
50const F32 LL_WIND_UPDATE_INTERVAL = 0.1f; 52const F32 LL_WIND_UPDATE_INTERVAL = 0.1f;
@@ -153,13 +155,13 @@ public:
153 // Internet stream methods 155 // Internet stream methods
154 virtual void startInternetStream(const std::string& url); 156 virtual void startInternetStream(const std::string& url);
155 virtual void stopInternetStream(); 157 virtual void stopInternetStream();
156 virtual void pauseInternetStream(int pause);
157 virtual void updateInternetStream(); 158 virtual void updateInternetStream();
158 virtual int isInternetStreamPlaying(); 159 virtual int isInternetStreamPlaying();
159 virtual void getInternetStreamInfo(char* artist, char* title); 160 virtual void getInternetStreamInfo(char* artist, char* title);
160 // use a value from 0.0 to 1.0, inclusive 161 // use a value from 0.0 to 1.0, inclusive
161 virtual void setInternetStreamGain(F32 vol); 162 virtual void setInternetStreamGain(F32 vol);
162 virtual const std::string& getInternetStreamURL(); 163 virtual const std::string& getInternetStreamURL();
164 virtual LLMediaBase::EStatus getStatus();
163 165
164 // For debugging usage 166 // For debugging usage
165 virtual LLVector3 getListenerPos(); 167 virtual LLVector3 getListenerPos();
@@ -246,6 +248,8 @@ protected:
246 248
247 LLFrameTimer mWindUpdateTimer; 249 LLFrameTimer mWindUpdateTimer;
248 250
251 LLMediaBase::EStatus mStatus;
252
249private: 253private:
250 void setDefaults(); 254 void setDefaults();
251 LLMediaBase *mInternetStreamMedia; 255 LLMediaBase *mInternetStreamMedia;