role-cork: Rename module-cork-music-on-phone to module-role-cork.

This module will be extended to be a bit more generic so the
old name will soon be obsolete.

diff --git a/src/Makefile.am b/src/Makefile.am
index ac1d227922ce991a25fb591bc868090b0db99804..cc3e13b34f277f9f72d11b45c59e41be4bfa0355 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1006,7 +1006,7 @@ modlibexec_LTLIBRARIES += \
                module-tunnel-source.la \
                module-position-event-sounds.la \
                module-augment-properties.la \
-               module-cork-music-on-phone.la \
+               module-role-cork.la \
                module-loopback.la \
                module-virtual-sink.la \
                module-virtual-source.la \
@@ -1298,7 +1298,7 @@ SYMDEF_FILES = \
                module-gconf-symdef.h \
                module-position-event-sounds-symdef.h \
                module-augment-properties-symdef.h \
-               module-cork-music-on-phone-symdef.h \
+               module-role-cork-symdef.h \
                module-console-kit-symdef.h \
                module-dbus-protocol-symdef.h \
                module-loopback-symdef.h \
@@ -1670,11 +1670,11 @@ module_augment_properties_la_LIBADD = $(MODULE_LIBADD)
 #module_augment_properties_la_CFLAGS = $(AM_CFLAGS) -DDESKTOPFILEDIR=\"$(datadir)/applications\"
 module_augment_properties_la_CFLAGS = $(AM_CFLAGS) -DDESKTOPFILEDIR=\"/usr/share/applications\"
 
-# Cork music streams while a phone stream is active
-module_cork_music_on_phone_la_SOURCES = modules/module-cork-music-on-phone.c
-module_cork_music_on_phone_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_cork_music_on_phone_la_LIBADD = $(MODULE_LIBADD)
-module_cork_music_on_phone_la_CFLAGS = $(AM_CFLAGS)
+# Cork certain streams while others are active (e.g. cork music when phone streams appear)
+module_role_cork_la_SOURCES = modules/module-role-cork.c
+module_role_cork_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_role_cork_la_LIBADD = $(MODULE_LIBADD)
+module_role_cork_la_CFLAGS = $(AM_CFLAGS)
 
 # Device description restore module
 module_device_manager_la_SOURCES = modules/module-device-manager.c

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index c6ec29cd6e8a800f98ed9932efa12aeb4d5d96e2..f2f22e8c5c741494163962a32cd0cb148030bc19 100755 (executable)
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -154,8 +154,8 @@ load-module module-console-kit
 ### Enable positioned event sounds
 load-module module-position-event-sounds
 
-### Cork music streams when a phone stream is active
-load-module module-cork-music-on-phone
+### Cork music/video streams when a phone stream is active
+load-module module-role-cork
 
 ### Modules to allow autoloading of filters (such as echo cancellation)
 ### on demand. module-filter-heuristics tries to determine what filters

diff --git a/src/modules/module-cork-music-on-phone.c b/src/modules/module-role-cork.c
similarity index 98%
rename from src/modules/module-cork-music-on-phone.c
rename to src/modules/module-role-cork.c
index 4c9c1788934783d3eda4637e39540e8a31f3c967..af412cf6d851b40fb929d1a8840fb700f2be2cbc 100644 (file)
--- a/src/modules/module-cork-music-on-phone.c
+++ b/src/modules/module-role-cork.c
@@ -33,10 +33,10 @@
 #include <pulsecore/sink-input.h>
 #include <pulsecore/modargs.h>
 
-#include "module-cork-music-on-phone-symdef.h"
+#include "module-role-cork-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering");
-PA_MODULE_DESCRIPTION("Mute or cork music while a phone stream exists");
+PA_MODULE_DESCRIPTION("Mute & cork streams with certain roles while others exist");
 PA_MODULE_VERSION(PACKAGE_VERSION);
 PA_MODULE_LOAD_ONCE(TRUE);