svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release

QAR-275 Parcel Media

Sam made me do it.

1 files changed, 49 insertions, 0 deletions

diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
new file mode 100644
index 0000000000..6ecaea54ce
--- /dev/null
+++ b/indra/newview/llviewermedia.h
@@ -0,0 +1,49 @@
+/** 
+ * @file llviewermedia.h
+ * @author Callum Prentice & James Cook
+ * @brief Client interface to the media engine
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+#ifndef LLVIEWERMEDIA_H
+#define LLVIEWERMEDIA_H
+
+#include "llmediabase.h"	// for status codes
+
+class LLUUID;
+
+class LLViewerMedia
+{
+	public:
+		static void initClass();
+		static void cleanupClass();
+
+		static void play(const std::string& media_url,
+						 const std::string& mime_type,
+						 const LLUUID& placeholder_texture_id,
+						 S32 media_width, S32 media_height, U8 media_auto_scale,
+						 U8 media_loop);
+		static void stop();
+		static void pause();
+		static void start();
+		static void seek(F32 time);
+		static void setVolume(F32 volume);
+		static LLMediaBase::EStatus getStatus();
+
+		static LLUUID getMediaTextureID();
+		static bool getMediaSize(S32 *media_width, S32 *media_height);
+		static bool getTextureSize(S32 *texture_width, S32 *texture_height);
+		static bool isMediaPlaying();
+		static bool isMediaPaused();
+		static bool hasMedia();
+		static bool isActiveMediaTexture(const LLUUID& id);
+
+		static std::string getMediaURL();
+		static std::string getMimeType();
+		static void setMimeType(std::string mime_type);
+
+		static void updateImagesMediaStreams();
+};
+
+#endif	// LLVIEWERMEDIA_H