merge changes for 5.0.1-release

2 files changed, 14 insertions, 12 deletions

diff --git a/indra/media_plugins/cef/windows_volume_catcher.cpp b/indra/media_plugins/cef/windows_volume_catcher.cpp
index 0cfb810906..c9ea3ed597 100644
--- a/indra/media_plugins/cef/windows_volume_catcher.cpp
+++ b/indra/media_plugins/cef/windows_volume_catcher.cpp
@@ -31,17 +31,16 @@
 #include "llsingleton.h"
 class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl>
 {
-friend LLSingleton<VolumeCatcherImpl>;
+	LLSINGLETON(VolumeCatcherImpl);
+	// This is a singleton class -- both callers and the component implementation should use getInstance() to find the instance.
+	~VolumeCatcherImpl();
+
 public:
 
 	void setVolume(F32 volume);
 	void setPan(F32 pan);
 	
 private:
-	// This is a singleton class -- both callers and the component implementation should use getInstance() to find the instance.
-	VolumeCatcherImpl();
-	~VolumeCatcherImpl();
-
 	typedef void (WINAPI *set_volume_func_t)(F32);
 	typedef void (WINAPI *set_mute_func_t)(bool);
 
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
index 0bd323eb58..ebcdde2960 100644
--- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
+++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
@@ -84,6 +84,7 @@ private:
 
 	float mCurTime;
 	float mDuration;
+	EStatus mVlcStatus;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -111,6 +112,7 @@ MediaPluginBase(host_send_func, host_user_data)
 
 	mURL = std::string();
 
+	mVlcStatus = STATUS_NONE;
 	setStatus(STATUS_NONE);
 }
 
@@ -209,28 +211,28 @@ void MediaPluginLibVLC::eventCallbacks(const libvlc_event_t* event, void* ptr)
 	switch (event->type)
 	{
 	case libvlc_MediaPlayerOpening:
-		parent->setStatus(STATUS_LOADING);
+		parent->mVlcStatus = STATUS_LOADING;
 		break;
 
 	case libvlc_MediaPlayerPlaying:
 		parent->mDuration = (float)(libvlc_media_get_duration(parent->mLibVLCMedia)) / 1000.0f;
-		parent->setStatus(STATUS_PLAYING);
+		parent->mVlcStatus = STATUS_PLAYING;
 		break;
 
 	case libvlc_MediaPlayerPaused:
-		parent->setStatus(STATUS_PAUSED);
+		parent->mVlcStatus = STATUS_PAUSED;
 		break;
 
 	case libvlc_MediaPlayerStopped:
-		parent->setStatus(STATUS_DONE);
+		parent->mVlcStatus = STATUS_DONE;
 		break;
 
 	case libvlc_MediaPlayerEndReached:
-		parent->setStatus(STATUS_DONE);
+		parent->mVlcStatus = STATUS_DONE;
 		break;
 
 	case libvlc_MediaPlayerEncounteredError:
-		parent->setStatus(STATUS_ERROR);
+		parent->mVlcStatus = STATUS_ERROR;
 		break;
 
 	case libvlc_MediaPlayerTimeChanged:
@@ -446,6 +448,7 @@ void MediaPluginLibVLC::receiveMessage(const char* message_string)
 			}
 			else if (message_name == "idle")
 			{
+				setStatus(mVlcStatus);
 			}
 			else if (message_name == "cleanup")
 			{
@@ -567,7 +570,7 @@ void MediaPluginLibVLC::receiveMessage(const char* message_string)
 				{
 					if (mLibVLCMediaPlayer)
 					{
-						libvlc_media_player_pause(mLibVLCMediaPlayer);
+						libvlc_media_player_set_pause(mLibVLCMediaPlayer, 1);
 					}
 				}
 				else if (message_name == "seek")