summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-22 12:03:31 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-22 12:03:31 +0000
commitcd368847dd2267e9ff3d1d871c8cad5f1bffa287 (patch)
treed56c3790144d47c86cb3eb423d183d16f92c5324 /indra/media_plugins/webkit
parentfae5c9b64efc2f77ca10cabc6c6e3d7c583bb4b0 (diff)
fill out the interface.
Diffstat (limited to 'indra/media_plugins/webkit')
-rw-r--r--indra/media_plugins/webkit/linux_volume_catcher.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp
index 34f797f5b2..637560eaab 100644
--- a/indra/media_plugins/webkit/linux_volume_catcher.cpp
+++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp
@@ -34,14 +34,19 @@
#include <pulse/introspect.h>
#include <pulse/context.h>
#include <pulse/subscribe.h>
-#include <pulse/glib-mainloop.h> // There's no special reason why we want the *glib* PA mainloop, but the generic non-glib implementation seems broken.
+#include <pulse/glib-mainloop.h> // There's no special reason why we want the *glib* PA mainloop, but the generic polling implementation seems broken.
class LinuxVolumeCatcherImpl
{
public:
- setVol(F32 volume); // 0.0-1.0
+ //void setVol(F32 volume); // 0.0-1.0
+ //LinuxVolumeCatcherImpl *impl;
private:
- F32 mLastDesiredVolume;
- pa_glib_mainloop
+ F32 mDesiredVolume;
+ pa_glib_mainloop *mMainloop;
+ pa_context *mLastContext;
+ bool connected;
+ std::set<U32> mSinkInputIndices;
+ std::map<U32,U32> mSinkInputNumChannels;
}