From b983c0bd14150b7e6d9c57a8ddd9a43cfd8d13bb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 Aug 2008 21:35:32 +0200 Subject: include host name in default sink/default source file --- src/modules/module-default-device-restore.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'src/modules') diff --git a/src/modules/module-default-device-restore.c b/src/modules/module-default-device-restore.c index 7f21efa0..4037881f 100644 --- a/src/modules/module-default-device-restore.c +++ b/src/modules/module-default-device-restore.c @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -41,8 +42,6 @@ PA_MODULE_DESCRIPTION("Automatically restore the default sink and source"); PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(TRUE); -#define DEFAULT_SINK_FILE "default-sink" -#define DEFAULT_SOURCE_FILE "default-source" #define DEFAULT_SAVE_INTERVAL 5 struct userdata { @@ -155,16 +154,28 @@ static void subscribe_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t id int pa__init(pa_module *m) { struct userdata *u; + char hn[256], *fn; pa_assert(m); m->userdata = u = pa_xnew0(struct userdata, 1); u->core = m->core; - if (!(u->sink_filename = pa_state_path(DEFAULT_SINK_FILE))) + if (!pa_get_host_name(hn, sizeof(hn))) goto fail; - if (!(u->source_filename = pa_state_path(DEFAULT_SOURCE_FILE))) + fn = pa_sprintf_malloc("default-sink.%s", hn); + u->sink_filename = pa_state_path(fn); + pa_xfree(fn); + + if (!u->sink_filename) + goto fail; + + fn = pa_sprintf_malloc("default-source.%s", hn); + u->source_filename = pa_state_path(fn); + pa_xfree(fn); + + if (!u->source_filename) goto fail; load(u); -- cgit