Linux: disable volume catcher for the time being to allow cef/dullahan to load

indra/media_plugins/cef/CMakeLists.txt

@@ -8,7 +8,7 @@ include(LLCommon)
 include(LLWindow)
 include(Linking)
 include(PluginAPI)
-include(MediaPluginBase)   # <FS:Zi> Linux volume catcher
+# include(MediaPluginBase)   # disable Linux volume catcher for the time being
 
 include(CEFPlugin)
 
@@ -37,6 +37,11 @@ add_compile_definitions(LL_VOLUME_CATCHER)
 if (LINUX)
 #  message(FATAL_ERROR "CEF plugin has been enabled for a Linux compile.\n"
 #    "  Please create a volume_catcher implementation for this platform.")
+  if(NOT LINUX_VOLUME_CATCHER)
+    set(LINUX_VOLUME_CATCHER dummy_volume_catcher.cpp)
+    message( "Building with dummy volume catcher" )
+  endif(NOT LINUX_VOLUME_CATCHER)
+
   list(APPEND media_plugin_cef_SOURCE_FILES ${LINUX_VOLUME_CATCHER})
   set(CMAKE_SHARED_LINKER_FLAGS  "-Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../../lib'")
   list(APPEND media_plugin_cef_LINK_LIBRARIES llwindow ${MEDIA_PLUGIN_BASE_LIBRARIES})

indra/media_plugins/cef/dummy_volume_catcher.cpp

@@ -0,0 +1,57 @@
+/**
+ * @file dummy_volume_catcher.cpp
+ * @brief A null implementation of the "VolumeCatcher" class for platforms where it's not implemented yet.
+ *
+ * @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
+ */
+
+#include "volume_catcher.h"
+
+
+class VolumeCatcherImpl
+{
+};
+
+/////////////////////////////////////////////////////
+
+VolumeCatcher::VolumeCatcher()
+{
+    pimpl = NULL;
+}
+
+VolumeCatcher::~VolumeCatcher()
+{
+}
+
+void VolumeCatcher::setVolume(F32 volume)
+{
+}
+
+void VolumeCatcher::setPan(F32 pan)
+{
+}
+
+void VolumeCatcher::pump()
+{
+}