svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910

svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.

1 files changed, 172 insertions, 34 deletions

diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index b3fb2c9031..68a49662e7 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -33,58 +33,196 @@
 #ifndef LLVIEWERMEDIA_H
 #define LLVIEWERMEDIA_H
 
-#include "llmediabase.h"	// for status codes
+#include "llfocusmgr.h"
+#include "lleditmenuhandler.h"
 
-class LLMediaManagerData;
+#include "llpanel.h"
+#include "llpluginclassmediaowner.h"
+
+#include "llviewermediaobserver.h"
+
+class LLViewerMediaImpl;
 class LLUUID;
+class LLViewerMediaTexture;
+
+typedef LLPointer<LLViewerMediaImpl> viewer_media_t;
+///////////////////////////////////////////////////////////////////////////////
+//
+class LLViewerMediaEventEmitter
+{
+public:
+	virtual ~LLViewerMediaEventEmitter();
+
+	bool addObserver( LLViewerMediaObserver* subject );
+	bool remObserver( LLViewerMediaObserver* subject );
+	void emitEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent event);
+
+private:
+	typedef std::list< LLViewerMediaObserver* > observerListType;
+	observerListType mObservers;
+};
 
 class LLViewerMedia
 {
+	LOG_CLASS(LLViewerMedia);
 	public:
 		// Special case early init for just web browser component
 		// so we can show login screen.  See .cpp file for details. JC
-		static void initBrowser();
 
-		static void initClass();
-		static void cleanupClass();
+		static viewer_media_t newMediaImpl(const std::string& media_url,
+												const LLUUID& texture_id,
+												S32 media_width, 
+												S32 media_height, 
+												U8 media_auto_scale,
+												U8 media_loop,
+												std::string mime_type = "none/none");
 
-		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 removeMedia(LLViewerMediaImpl* media);
+		static LLViewerMediaImpl* getMediaImplFromTextureID(const LLUUID& texture_id);
+		static std::string getCurrentUserAgent();
+		static void updateBrowserUserAgent();
+		static bool handleSkinCurrentChanged(const LLSD& /*newvalue*/);
+		static bool textureHasMedia(const LLUUID& texture_id);
 		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 bool isMusicPlaying();
 
-		static std::string getMediaURL();
-		static std::string getMimeType();
-		static void setMimeType(std::string mime_type);
+		static void updateMedia();
+		static bool isMusicPlaying();
 
-		static void updateImagesMediaStreams();
+		static void cleanupClass();
 
 		static void toggleMusicPlay(void*);
 		static void toggleMediaPlay(void*);
 		static void mediaStop(void*);
+};
+
+// Implementation functions not exported into header file
+class LLViewerMediaImpl
+	:	public LLMouseHandler, public LLRefCount, public LLPluginClassMediaOwner, public LLViewerMediaEventEmitter, public LLEditMenuHandler
+{
+	LOG_CLASS(LLViewerMediaImpl);
+public:
+
+	LLViewerMediaImpl(const std::string& media_url,
+		const LLUUID& texture_id,
+		S32 media_width, 
+		S32 media_height, 
+		U8 media_auto_scale,
+		U8 media_loop,
+		const std::string& mime_type);
+
+	~LLViewerMediaImpl();
+	void createMediaSource();
+	void destroyMediaSource();
+	void setMediaType(const std::string& media_type);
+	bool initializeMedia(const std::string& mime_type);
+	bool initializePlugin(const std::string& media_type);
+	LLPluginClassMedia* getMediaPlugin() { return mMediaSource; }
+	void setSize(int width, int height);
+
+	void play();
+	void stop();
+	void pause();
+	void start();
+	void seek(F32 time);
+	void setVolume(F32 volume);
+	void focus(bool focus);
+	void mouseDown(S32 x, S32 y);
+	void mouseUp(S32 x, S32 y);
+	void mouseMove(S32 x, S32 y);
+	void mouseLeftDoubleClick(S32 x,S32 y );
+	void mouseCapture();
+
+	void navigateHome();
+	void navigateTo(const std::string& url, const std::string& mime_type = "", bool rediscover_type = false);
+	void navigateStop();
+	bool handleKeyHere(KEY key, MASK mask);
+	bool handleUnicodeCharHere(llwchar uni_char);
+	bool canNavigateForward();
+	bool canNavigateBack();
+	std::string getMediaURL() { return mMediaURL; }
+	std::string getMediaHomeURL() { return mHomeURL; }
+	std::string getMimeType() { return mMimeType; }
+	void scaleMouse(S32 *mouse_x, S32 *mouse_y);
+
+	void update();
+	void updateMovieImage(const LLUUID& image_id, BOOL active);
+	void updateImagesMediaStreams();
+	LLUUID getMediaTextureID();
+	
+	void suspendUpdates(bool suspend) { mSuspendUpdates = suspend; };
+	void setVisible(bool visible);
+
+	bool isMediaPlaying();
+	bool isMediaPaused();
+	bool hasMedia();
+
+	// utility function to create a ready-to-use media instance from a desired media type.
+	static LLPluginClassMedia* newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height);
+
+	// Internally set our desired browser user agent string, including
+	// the Second Life version and skin name.  Used because we can
+	// switch skins without restarting the app.
+	static void updateBrowserUserAgent();
+
+	// Callback for when the SkinCurrent control is changed to
+	// switch the user agent string to indicate the new skin.
+	static bool handleSkinCurrentChanged(const LLSD& newvalue);
+
+	// need these to handle mouseup...
+	/*virtual*/ void	onMouseCaptureLost();
+	/*virtual*/ BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
+
+	// Grr... the only thing I want as an LLMouseHandler are the onMouseCaptureLost and handleMouseUp calls.
+	// Sadly, these are all pure virtual, so I have to supply implementations here:
+	/*virtual*/ BOOL	handleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; };
+	/*virtual*/ BOOL	handleHover(S32 x, S32 y, MASK mask) { return FALSE; };
+	/*virtual*/ BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks) { return FALSE; };
+	/*virtual*/ BOOL	handleDoubleClick(S32 x, S32 y, MASK mask) { return FALSE; };
+	/*virtual*/ BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask) { return FALSE; };
+	/*virtual*/ BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask) { return FALSE; };
+	/*virtual*/ BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) { return FALSE; };
+	/*virtual*/ BOOL	handleMiddleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; };
+	/*virtual*/ BOOL	handleMiddleMouseUp(S32 x, S32 y, MASK mask) {return FALSE; };
+	/*virtual*/ const std::string& getName() const { return LLStringUtil::null; };
+	/*virtual*/ BOOL isView() const { return FALSE; };
+	/*virtual*/ void	screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const {};
+	/*virtual*/ void	localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const {};
+	/*virtual*/ BOOL hasMouseCapture() { return gFocusMgr.getMouseCapture() == this; };
+
+	// Inherited from LLPluginClassMediaOwner
+	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent);
+
+	// LLEditMenuHandler overrides
+	/*virtual*/ void	cut();
+	/*virtual*/ BOOL	canCut() const;
+
+	/*virtual*/ void	copy();
+	/*virtual*/ BOOL	canCopy() const;
+
+	/*virtual*/ void	paste();
+	/*virtual*/ BOOL	canPaste() const;
+	
+public:
+	// a single media url with some data and an impl.
+	LLPluginClassMedia* mMediaSource;
+	LLUUID mTextureId;
+	bool  mMovieImageHasMips;
+	std::string mMediaURL;
+	std::string mHomeURL;
+	std::string mMimeType;
+	S32 mLastMouseX;	// save the last mouse coord we get, so when we lose capture we can simulate a mouseup at that point.
+	S32 mLastMouseY;
+	S32 mMediaWidth;
+	S32 mMediaHeight;
+	bool mMediaAutoScale;
+	bool mMediaLoop;
+	bool mNeedsNewTexture;
+	bool mSuspendUpdates;
+	bool mVisible;
+
 
-	private:
-		// Fill in initialization data for LLMediaManager::initClass()
-		static void buildMediaManagerData( LLMediaManagerData* init_data );
-		
-		enum { STOPPED=0, PLAYING=1, PAUSED=2 };
-		static S32 mMusicState;
+private:
+	LLViewerMediaTexture *updatePlaceholderImage();
 };
 
 #endif	// LLVIEWERMEDIA_H