mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-10 13:29:58 -05:00
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
This commit is contained in:
commit
6ba3333030
41 changed files with 4140 additions and 2911 deletions
|
|
@ -190,7 +190,7 @@ int pa_authkey_load_auto(const char *fn, void *data, size_t length) {
|
|||
return pa_authkey_load(p, data, length);
|
||||
}
|
||||
|
||||
/* Store the specified cookie in the speicified cookie file */
|
||||
/* Store the specified cookie in the specified cookie file */
|
||||
int pa_authkey_save(const char *fn, const void *data, size_t length) {
|
||||
int fd = -1;
|
||||
int unlock = 0, ret = -1;
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ ssize_t pa_write(int fd, const void *buf, size_t count, int *type) {
|
|||
}
|
||||
|
||||
/** Calls read() in a loop. Makes sure that as much as 'size' bytes,
|
||||
* unless EOF is reached or an error occured */
|
||||
* unless EOF is reached or an error occurred */
|
||||
ssize_t pa_loop_read(int fd, void*data, size_t size, int *type) {
|
||||
ssize_t ret = 0;
|
||||
int _type;
|
||||
|
|
@ -1242,7 +1242,7 @@ int pa_lock_lockfile(const char *fn) {
|
|||
goto fail;
|
||||
}
|
||||
|
||||
/* Check wheter the file has been removed meanwhile. When yes,
|
||||
/* Check whether the file has been removed meanwhile. When yes,
|
||||
* restart this loop, otherwise, we're done */
|
||||
if (st.st_nlink >= 1)
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ void pa_log_levelv_meta(
|
|||
|
||||
/* We don't use dynamic memory allocation here to minimize the hit
|
||||
* in RT threads */
|
||||
char text[4096], location[128], timestamp[32];
|
||||
char text[16*1024], location[128], timestamp[32];
|
||||
|
||||
pa_assert(level < PA_LOG_LEVEL_MAX);
|
||||
pa_assert(format);
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ struct pa_sink_input {
|
|||
* changes. Called from IO context. */
|
||||
void (*update_max_rewind) (pa_sink_input *i, size_t nbytes); /* may be NULL */
|
||||
|
||||
/* Called whenever the maxiumum request size of the sink
|
||||
/* Called whenever the maximum request size of the sink
|
||||
* changes. Called from IO context. */
|
||||
void (*update_max_request) (pa_sink_input *i, size_t nbytes); /* may be NULL */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue