mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-12-22 08:56:52 -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
|
|
@ -42,7 +42,7 @@ static void once_func(void) {
|
|||
pa_log("once!");
|
||||
}
|
||||
|
||||
static pa_once_t once = PA_ONCE_INIT;
|
||||
static pa_once once = PA_ONCE_INIT;
|
||||
|
||||
static void thread_func(void *data) {
|
||||
pa_tls_set(tls, data);
|
||||
|
|
@ -72,7 +72,7 @@ static void thread_func(void *data) {
|
|||
|
||||
pa_mutex_unlock(mutex);
|
||||
|
||||
pa_once(&once, once_func);
|
||||
pa_run_once(&once, once_func);
|
||||
|
||||
pa_cond_signal(cond2, 0);
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
assert(pa_thread_is_running(pa_thread_self()));
|
||||
|
||||
mutex = pa_mutex_new(0);
|
||||
mutex = pa_mutex_new(FALSE, FALSE);
|
||||
cond1 = pa_cond_new();
|
||||
cond2 = pa_cond_new();
|
||||
tls = pa_tls_new(pa_xfree);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue