diff options
| author | Pierre Ossman <ossman@cendio.se> | 2006-01-05 22:51:37 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2006-01-05 22:51:37 +0000 |
| commit | 19d9fcbda8637099854f2d8147b402b4420d19f5 (patch) | |
| tree | 993f0ebc9045bd893cd3039d0ae6277ee5806c05 /polyp/client-conf.c | |
| parent | 2f74bb9d437fc165695e1d4bb7516ca979962a49 (diff) | |
Port to Windows. This is mostly glue layers for the poor POSIX support
on Windows. A few notes
* Only sockets behave somewhat like file descriptors in UNIX.
* There are no fixed paths. Closes thing is environment variables that point
to system directories. We also figure out where the binary/dll is
located and use that as configuration directory.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@418 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/client-conf.c')
| -rw-r--r-- | polyp/client-conf.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/polyp/client-conf.c b/polyp/client-conf.c index 4906383d..04c3d2ef 100644 --- a/polyp/client-conf.c +++ b/polyp/client-conf.c @@ -19,6 +19,10 @@ USA. ***/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdlib.h> #include <assert.h> #include <unistd.h> @@ -33,11 +37,21 @@ #include "authkey.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 + +#ifndef OS_IS_WIN32 +# define PATH_SEP "/" +#else +# define PATH_SEP "\\" #endif -#define DEFAULT_CLIENT_CONFIG_FILE DEFAULT_CONFIG_DIR"/client.conf" -#define DEFAULT_CLIENT_CONFIG_FILE_USER ".polypaudio/client.conf" +#define DEFAULT_CLIENT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "client.conf" +#define DEFAULT_CLIENT_CONFIG_FILE_USER ".polypaudio" PATH_SEP "client.conf" #define ENV_CLIENT_CONFIG_FILE "POLYP_CLIENTCONFIG" #define ENV_DEFAULT_SINK "POLYP_SINK" |