diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-22 14:00:10 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-22 14:00:10 +0000 |
| commit | 551771fd90e2caf58856b746d4dfc108679cc05f (patch) | |
| tree | 19901b24d993090b5185026c3c823007524b66c2 | |
| parent | 8c7d218f4e5cc83296dcfba0e238ca2cc57c6b74 (diff) | |
Got this building okay now. It's not hooked-up to the webkit plugin yet, so I don't know if it *works*.
| -rw-r--r-- | indra/media_plugins/webkit/linux_volume_catcher.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp index a6a2ec7c7a..1439f1c5a5 100644 --- a/indra/media_plugins/webkit/linux_volume_catcher.cpp +++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp @@ -206,7 +206,8 @@ void LinuxVolumeCatcherImpl::update_index_volume(U32 index, F32 volume) const pa_cvolume *cvolumep = &cvol; pa_context_success_cb_t cb = NULL; // okay as null void *userdata = NULL; // okay as null - + + pa_operation *op; if ((op = pa_context_set_sink_input_volume(c, idx, cvolumep, cb, userdata))) { pa_operation_unref(op); @@ -216,7 +217,7 @@ void LinuxVolumeCatcherImpl::update_index_volume(U32 index, F32 volume) void callback_discovered_sinkinput(pa_context *context, const pa_sink_input_info *sii, int eol, void *userdata) { - LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>(userdata); + LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>((LinuxVolumeCatcherImpl*)userdata); llassert(impl); if (0 == eol) @@ -249,7 +250,7 @@ void callback_discovered_sinkinput(pa_context *context, const pa_sink_input_info void callback_subscription_alert(pa_context *context, pa_subscription_event_type_t t, uint32_t index, void *userdata) { - LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>(userdata); + LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>((LinuxVolumeCatcherImpl*)userdata); llassert(impl); switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) { @@ -267,7 +268,7 @@ void callback_subscription_alert(pa_context *context, pa_subscription_event_type pa_operation *op; if ((op = pa_context_get_sink_input_info(impl->mPAContext, index, callback_discovered_sinkinput, impl))) { - pa_operation_unref(o); + pa_operation_unref(op); } } break; @@ -278,14 +279,14 @@ void callback_subscription_alert(pa_context *context, pa_subscription_event_type void callback_context_state(pa_context *context, void *userdata) { - LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>(userdata); + LinuxVolumeCatcherImpl *impl = dynamic_cast<LinuxVolumeCatcherImpl*>((LinuxVolumeCatcherImpl*)userdata); llassert(impl); - switch (pa_context_get_state(c)) + switch (pa_context_get_state(context)) { case PA_CONTEXT_READY: impl->mConnected = true; - impl->connected_okay(c); + impl->connected_okay(); break; case PA_CONTEXT_TERMINATED: impl->mConnected = false; @@ -304,7 +305,7 @@ LinuxVolumeCatcher::LinuxVolumeCatcher() pimpl = new LinuxVolumeCatcherImpl(); } -LinuxVolumeCatcher::LinuxVolumeCatcher~() +LinuxVolumeCatcher::~LinuxVolumeCatcher() { delete pimpl; pimpl = NULL; |