mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
6687dd0131
commit
a67c21f093
294 changed files with 79057 additions and 11614 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue