summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/webkit/linux_volume_catcher.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp
index cfb78d2036..cc5a456c96 100644
--- a/indra/media_plugins/webkit/linux_volume_catcher.cpp
+++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp
@@ -148,9 +148,20 @@ void LinuxVolumeCatcherImpl::init()
void LinuxVolumeCatcherImpl::cleanup()
{
- // there's some cleanup we could do, but do nothing... for now.
-
mConnected = false;
+
+ if (mPAContext)
+ {
+ pa_context_disconnect(mPAContext);
+ pa_context_unref(mPAContext);
+ mPAContext = NULL;
+ }
+
+ if (mMainloop)
+ {
+ pa_glib_mainloop_free(mMainloop);
+ mMainloop = NULL;
+ }
}
void LinuxVolumeCatcherImpl::setVolume(F32 volume)