aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/llmediaengine.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:23 -0500
committerJacek Antonelli2008-08-15 23:45:23 -0500
commit486c4774ab4a707d69c1b48cdc048af1369084db (patch)
tree2a206a7e32a9a7efb98d585798a9fa18baeaf171 /linden/indra/llmedia/llmediaengine.h
parentSecond Life viewer sources 1.18.6.1-RC (diff)
downloadmeta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.zip
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.gz
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.bz2
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.xz
Second Life viewer sources 1.18.6.2-RC
Diffstat (limited to 'linden/indra/llmedia/llmediaengine.h')
-rw-r--r--linden/indra/llmedia/llmediaengine.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/llmedia/llmediaengine.h b/linden/indra/llmedia/llmediaengine.h
index e585c13..836e075 100644
--- a/linden/indra/llmedia/llmediaengine.h
+++ b/linden/indra/llmedia/llmediaengine.h
@@ -42,6 +42,9 @@
42 42
43#include "message.h" 43#include "message.h"
44 44
45// current version on my Windows system after a 7.3.1 update is 120684544 (dec) and 7318000 (hex)
46#define LL_MIN_QUICKTIME_VERSION ( 120684544 )
47
45////////////////////////////////////////////////////////////////////////////// 48//////////////////////////////////////////////////////////////////////////////
46// media engine singleton 49// media engine singleton
47class LLMediaEngine 50class LLMediaEngine
@@ -83,6 +86,7 @@ public:
83 void setAutoScaled ( BOOL autoScaledIn ); 86 void setAutoScaled ( BOOL autoScaledIn );
84 BOOL isAutoScaled (); 87 BOOL isAutoScaled ();
85 BOOL setVolume ( F32 volumeIn ); 88 BOOL setVolume ( F32 volumeIn );
89 S32 getQuickTimeVersion();
86 90
87 void setUrl ( const LLString& urlIn ); 91 void setUrl ( const LLString& urlIn );
88 const LLString& getUrl (); 92 const LLString& getUrl ();