Move Linux specific VolumeCatcherImport into the linux specific files.

3 files changed, 27 insertions, 27 deletions

diff --git a/indra/media_plugins/cef/linux/volume_catcher_linux.cpp b/indra/media_plugins/cef/linux/volume_catcher_linux.cpp
index b4d20935e7..7d33242063 100644
--- a/indra/media_plugins/cef/linux/volume_catcher_linux.cpp
+++ b/indra/media_plugins/cef/linux/volume_catcher_linux.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file volume_catcher.cpp
  * @brief Linux volume catcher which will pick an implementation to use
  *
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2010&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  * @endcond
@@ -28,8 +28,6 @@
 
 #include "volume_catcher_linux.h"
 
-////////////////////////////////////////////////////
-
 VolumeCatcher::VolumeCatcher()
 {
 }
diff --git a/indra/media_plugins/cef/linux/volume_catcher_linux.h b/indra/media_plugins/cef/linux/volume_catcher_linux.h
index ff00d0672e..9101575b70 100644
--- a/indra/media_plugins/cef/linux/volume_catcher_linux.h
+++ b/indra/media_plugins/cef/linux/volume_catcher_linux.h
@@ -1,26 +1,26 @@
-/** 
+/**
  * @file volume_catcher_impl.h
- * @brief 
+ * @brief
  *
  * @cond
  * $LicenseInfo:firstyear=2010&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  * @endcond
@@ -49,6 +49,20 @@ extern "C" {
 
 #include "media_plugin_base.h"
 
+class VolumeCatcherImpl
+{
+public:
+	virtual ~VolumeCatcherImpl() = default;
+
+	virtual void setVolume(F32 volume) = 0; // 0.0 - 1.0
+
+	// Set the left-right pan of audio sources
+	// where -1.0 = left, 0 = center, and 1.0 = right
+	virtual void setPan(F32 pan) = 0;
+
+	virtual void pump() = 0; // call this at least a few times a second if you can - it affects how quickly we can 'catch' a new audio source and adjust its volume
+};
+
 class VolumeCatcherPulseAudio : public VolumeCatcherImpl
 {
 public:
diff --git a/indra/media_plugins/cef/volume_catcher.h b/indra/media_plugins/cef/volume_catcher.h
index 51a309fb97..d6ac8e9159 100644
--- a/indra/media_plugins/cef/volume_catcher.h
+++ b/indra/media_plugins/cef/volume_catcher.h
@@ -31,21 +31,9 @@
 
 #include "linden_common.h"
 
-class VolumeCatcherImpl
-{
-public:
-	virtual ~VolumeCatcherImpl() = default;
-
-	virtual void setVolume(F32 volume) = 0; // 0.0 - 1.0
-	
-	// Set the left-right pan of audio sources
-	// where -1.0 = left, 0 = center, and 1.0 = right
-	virtual void setPan(F32 pan) = 0; 
-
-	virtual void pump() = 0; // call this at least a few times a second if you can - it affects how quickly we can 'catch' a new audio source and adjust its volume
-};
+class VolumeCatcherImpl;
 
-class VolumeCatcher : public VolumeCatcherImpl
+class VolumeCatcher
 {
 public:
 	VolumeCatcher();