2 files changed, 6 insertions, 9 deletions
diff --git a/indra/media_plugins/webkit/mac_volume_catcher.cpp b/indra/media_plugins/webkit/mac_volume_catcher.cpp
index 9788f10a58..38727e5965 100644
--- a/indra/media_plugins/webkit/mac_volume_catcher.cpp
+++ b/indra/media_plugins/webkit/mac_volume_catcher.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file dummy_volume_catcher.cpp
+ * @file mac_volume_catcher.cpp
  * @brief A Mac OS X specific hack to control the volume level of all audio channels opened by a process.
  *
  * @cond
@@ -98,7 +98,7 @@ VolumeCatcherImpl *VolumeCatcherImpl::getInstance()
 VolumeCatcherImpl::VolumeCatcherImpl()
 {
 	mVolume = 1.0;	// default to full volume
-	mPan = 0.5;		// and center pan
+	mPan = 0.0;		// and center pan
 		
 	ComponentDescription desc;
 	desc.componentType = kAudioUnitType_Output;
diff --git a/indra/media_plugins/webkit/windows_volume_catcher.cpp b/indra/media_plugins/webkit/windows_volume_catcher.cpp
index fdff28c2c1..ef96102a0a 100644
--- a/indra/media_plugins/webkit/windows_volume_catcher.cpp
+++ b/indra/media_plugins/webkit/windows_volume_catcher.cpp
@@ -34,7 +34,6 @@
 #include "volume_catcher.h"
 #include <windows.h>
 #include "llsingleton.h"
-
 class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl>
 {
 friend LLSingleton<VolumeCatcherImpl>;
@@ -48,8 +47,8 @@ private:
 	VolumeCatcherImpl();
 	~VolumeCatcherImpl();
 
-	typedef void (*set_volume_func_t)(F32);
-	typedef void (*set_mute_func_t)(bool);
+	typedef void (WINAPI *set_volume_func_t)(F32);
+	typedef void (WINAPI *set_mute_func_t)(bool);
 
 	set_volume_func_t mSetVolumeFunc;
 	set_mute_func_t mSetMuteFunc;
@@ -57,7 +56,6 @@ private:
 	F32 	mVolume;
 	F32 	mPan;
 };
-
 VolumeCatcherImpl::VolumeCatcherImpl()
 :	mVolume(1.0f),	// default volume is max
 	mPan(0.f)		// default pan is centered
@@ -77,10 +75,8 @@ VolumeCatcherImpl::~VolumeCatcherImpl()
 
 void VolumeCatcherImpl::setVolume(F32 volume)
 {
-	//F32 left_volume = volume * min(1.f, 1.f - mPan);
-	//F32 right_volume = volume * max(0.f, 1.f + mPan);
-	
 	mVolume = volume;
+
 	if (mSetMuteFunc)
 	{
 		mSetMuteFunc(volume == 0.f);
@@ -123,3 +119,4 @@ void VolumeCatcher::pump()
 	// No periodic tasks are necessary for this implementation.
 }
 
+