diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 21:51:25 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 21:51:25 -0800 |
| commit | 2f785135bc39575ec306b2b057e446e61c5369d7 (patch) | |
| tree | 8c2e6a03962b24700694c6887dacd1558df7cde9 /indra/media_plugins | |
| parent | 31e4b6e79ccd0a0451de3fa6a487f775d9f45497 (diff) | |
| parent | b214180ac189f6c6347347c5d3a5dc7035e0c039 (diff) | |
Merge with viewer 2.
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/webkit/linux_volume_catcher.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp index 2ba28bd4bf..52ab766f7f 100644 --- a/indra/media_plugins/webkit/linux_volume_catcher.cpp +++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp @@ -398,7 +398,8 @@ void callback_subscription_alert(pa_context *context, pa_subscription_event_type impl->mSinkInputIndices.erase(index); impl->mSinkInputNumChannels.erase(index); } - else + else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == + PA_SUBSCRIPTION_EVENT_NEW) { // ask for more info about this new sinkinput pa_operation *op; @@ -407,6 +408,10 @@ void callback_subscription_alert(pa_context *context, pa_subscription_event_type llpa_operation_unref(op); } } + else + { + // property change on this sinkinput - we don't care. + } break; default:; |