mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/Makefile.am src/daemon/daemon-conf.c src/daemon/daemon.conf.in src/modules/module-stream-restore.c src/pulse/client-conf.c src/pulsecore/namereg.c
This commit is contained in:
commit
bcaba0b1b4
134 changed files with 15076 additions and 12812 deletions
|
|
@ -126,6 +126,8 @@ char* pa_find_config_file(const char *global, const char *local, const char *env
|
|||
|
||||
char *pa_get_runtime_dir(void);
|
||||
char *pa_get_state_dir(void);
|
||||
char *pa_get_home_dir_malloc(void);
|
||||
char *pa_get_binary_name_malloc(void);
|
||||
char *pa_runtime_path(const char *fn);
|
||||
char *pa_state_path(const char *fn, pa_bool_t prepend_machine_id);
|
||||
|
||||
|
|
@ -243,4 +245,9 @@ char **pa_split_spaces_strv(const char *s);
|
|||
|
||||
char* pa_maybe_prefix_path(const char *path, const char *prefix);
|
||||
|
||||
/* Returns size of the specified pipe or 4096 on failure */
|
||||
size_t pa_pipe_buf(int fd);
|
||||
|
||||
void pa_reset_personality(void);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue