Merge commit 'elmarco/bt-wip'

diff --cc src/modules/bluetooth/module-bluetooth-device.c
Simple merge

diff --cc src/pulsecore/core.h
index aca96bb,8fa9761..53e2d2c
--- 1/src/pulsecore/core.h
--- 2/src/pulsecore/core.h
+++ b/src/pulsecore/core.h
@@@ -81,9 -81,9 +82,10 @@@ typedef enum pa_core_hook 
      PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK_POST,
      PA_CORE_HOOK_SOURCE_OUTPUT_MOVE_START,
      PA_CORE_HOOK_SOURCE_OUTPUT_MOVE_FINISH,
+     PA_CORE_HOOK_SOURCE_OUTPUT_MOVE_FAIL,
      PA_CORE_HOOK_SOURCE_OUTPUT_STATE_CHANGED,
      PA_CORE_HOOK_SOURCE_OUTPUT_PROPLIST_CHANGED,
 +    PA_CORE_HOOK_SOURCE_OUTPUT_SEND_EVENT,
      PA_CORE_HOOK_CLIENT_NEW,
      PA_CORE_HOOK_CLIENT_PUT,
      PA_CORE_HOOK_CLIENT_UNLINK,

diff --cc src/pulsecore/sink.c
Simple merge