summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-08-06 21:35:32 +0200
committerLennart Poettering <lennart@poettering.net>2008-08-06 21:35:32 +0200
commitb983c0bd14150b7e6d9c57a8ddd9a43cfd8d13bb (patch)
treed61cd75ad967b68194a16e915c4b780a0f57a384 /src/modules
parentbb7f80d4d884d02af440eaa1dc99394269206f7b (diff)
include host name in default sink/default source file
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/module-default-device-restore.c19
1 files changed, 15 insertions, 4 deletions
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 <stdio.h>
#include <pulse/timeval.h>
+#include <pulse/util.h>
#include <pulsecore/core-util.h>
#include <pulsecore/module.h>
@@ -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);