This is the second version of the consolidation of module-role-cork and module-role-ducking. Following the feedback I received I moved the code to stream-interaction.c which will then be used by both modules. The first four patches are functional changes to module-role-cork, the other five implement the merging of the two modules. Georg Chini (9): role-cork: Don't ignore streams without media.role role-cork: React to mute/cork of trigger streams and to proplist changes role-cork: allow cork of all non-trigger streams using cork_roles=any_role role-cork: remove corking on module exit role-cork: prepare merge with role-ducking: move most code to stream-interaction.c role-cork: prepare merge with role-ducking: replace "cork" with "interact" where appropriate role-cork: more cosmetic changes, changed debug output role-cork: add ducking functionality to stream-interaction.c role-ducking: let module-role-ducking use the common code in stream-interaction.c src/Makefile.am | 6 +- src/modules/module-role-cork.c | 256 +----------------------- src/modules/module-role-ducking.c | 261 +------------------------ src/modules/stream-interaction.c | 402 ++++++++++++++++++++++++++++++++++++++ src/modules/stream-interaction.h | 21 ++ 5 files changed, 433 insertions(+), 513 deletions(-) create mode 100644 src/modules/stream-interaction.c create mode 100644 src/modules/stream-interaction.h -- 2.1.4