summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-22 16:55:14 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-22 16:55:14 +0000
commit96ddf30a49a4ebca25816701373c34674088b2ce (patch)
tree990bc0d31132f683d94724b08e71529ce6bcdbfd /indra/media_plugins
parentf43a9a181ee0233adaed03a93190dc518ff0047f (diff)
support LL_PULSEAUDIO_ENABLED=0 - probably.
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/webkit/linux_volume_catcher.cpp29
1 files changed, 27 insertions, 2 deletions
diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp
index a2a99d5728..2ba28bd4bf 100644
--- a/indra/media_plugins/webkit/linux_volume_catcher.cpp
+++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp
@@ -42,6 +42,11 @@
#include "linden_common.h"
+#include "linux_volume_catcher.h"
+
+
+#if LL_PULSEAUDIO_ENABLED
+
extern "C" {
#include <glib.h>
@@ -54,8 +59,6 @@ extern "C" {
#include "apr_dso.h"
}
-#include "linux_volume_catcher.h"
-
////////////////////////////////////////////////////
#define DEBUGMSG(...) do {} while(0)
@@ -456,3 +459,25 @@ void LinuxVolumeCatcher::pump()
pimpl->pump();
}
+#else // !LL_PULSEAUDIO_ENABLED
+
+// stub.
+
+LinuxVolumeCatcher::LinuxVolumeCatcher()
+{
+ pimpl = NULL;
+}
+
+LinuxVolumeCatcher::~LinuxVolumeCatcher()
+{
+}
+
+void LinuxVolumeCatcher::setVolume(F32 volume)
+{
+}
+
+void LinuxVolumeCatcher::pump()
+{
+}
+
+#endif // LL_PULSEAUDIO_ENABLED