diff options
| author | angela <angela@lindenlab.com> | 2010-02-23 23:57:50 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-23 23:57:50 +0800 |
| commit | 01ad8456a2566d258124677e0c7ce5eaa5003569 (patch) | |
| tree | 381f50d83c727a46044733a776a252427c91627e /indra/media_plugins/webkit/linux_volume_catcher.cpp | |
| parent | e98d6a910a39671225f1af627570aee58517ea7f (diff) | |
| parent | 43a9699de16c85d1c1a599fbe14512fbb6cbada1 (diff) | |
merge
Diffstat (limited to 'indra/media_plugins/webkit/linux_volume_catcher.cpp')
| -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:; |