diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-01-10 17:51:06 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-01-10 17:51:06 +0000 |
| commit | f7a99e90470526bb28cc0c225f96490110094aed (patch) | |
| tree | cbcc4f2df6d66e180fd65ee50488545786d094f1 /polyp/daemon-conf.c | |
| parent | 80ae72ce45dbc23ddc360749924110dcc752491e (diff) | |
Merge Pierre's changes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@445 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/daemon-conf.c')
| -rw-r--r-- | polyp/daemon-conf.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/polyp/daemon-conf.c b/polyp/daemon-conf.c index a6afd05a..780581b2 100644 --- a/polyp/daemon-conf.c +++ b/polyp/daemon-conf.c @@ -37,13 +37,23 @@ #include "resampler.h" #ifndef DEFAULT_CONFIG_DIR -#define DEFAULT_CONFIG_DIR "/etc/polypaudio" +# ifndef OS_IS_WIN32 +# define DEFAULT_CONFIG_DIR "/etc/polypaudio" +# else +# define DEFAULT_CONFIG_DIR "%POLYP_ROOT%" +# endif #endif -#define DEFAULT_SCRIPT_FILE DEFAULT_CONFIG_DIR"/default.pa" -#define DEFAULT_SCRIPT_FILE_USER ".polypaudio/default.pa" -#define DEFAULT_CONFIG_FILE DEFAULT_CONFIG_DIR"/daemon.conf" -#define DEFAULT_CONFIG_FILE_USER ".polypaudio/daemon.conf" +#ifndef OS_IS_WIN32 +# define PATH_SEP "/" +#else +# define PATH_SEP "\\" +#endif + +#define DEFAULT_SCRIPT_FILE DEFAULT_CONFIG_DIR PATH_SEP "default.pa" +#define DEFAULT_SCRIPT_FILE_USER ".polypaudio" PATH_SEP "default.pa" +#define DEFAULT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "daemon.conf" +#define DEFAULT_CONFIG_FILE_USER ".polypaudio" PATH_SEP "daemon.conf" #define ENV_SCRIPT_FILE "POLYP_SCRIPT" #define ENV_CONFIG_FILE "POLYP_CONFIG" |