diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-10-28 19:13:50 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-10-28 19:13:50 +0000 |
| commit | a67c21f093202f142438689d3f7cfbdf4ea82eea (patch) | |
| tree | 5c3295037f033904bc11ab8b3adae5b7331101e9 /src/daemon/daemon-conf.h | |
| parent | 6687dd013169fd8436aa1b45ccdacff074a40d05 (diff) | |
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon/daemon-conf.h')
| -rw-r--r-- | src/daemon/daemon-conf.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/daemon/daemon-conf.h b/src/daemon/daemon-conf.h index 4843a610..4d37861d 100644 --- a/src/daemon/daemon-conf.h +++ b/src/daemon/daemon-conf.h @@ -26,6 +26,7 @@ ***/ #include <pulsecore/log.h> +#include <pulse/sample.h> #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> @@ -39,7 +40,9 @@ typedef enum pa_daemon_conf_cmd { PA_CMD_DUMP_CONF, PA_CMD_DUMP_MODULES, PA_CMD_KILL, - PA_CMD_CHECK + PA_CMD_CHECK, + PA_CMD_DUMP_RESAMPLE_METHODS, + PA_CMD_CLEANUP_SHM } pa_daemon_conf_cmd_t; #ifdef HAVE_SYS_RESOURCE_H @@ -80,6 +83,8 @@ typedef struct pa_daemon_conf { #endif #endif + unsigned default_n_fragments, default_fragment_size_msec; + pa_sample_spec default_sample_spec; } pa_daemon_conf; /* Allocate a new structure and fill it with sane defaults */ |