diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-12-06 15:53:36 +0100 |
---|---|---|
committer | Daniel Mack <daniel@caiaq.de> | 2009-12-06 15:53:36 +0100 |
commit | f9b03d3a44e905d50dfac1483dbf1818d2b84ffa (patch) | |
tree | f94902497876669b4238798f160dae765a430c58 /src/pulse/thread-mainloop.c | |
parent | 1b2cbe92dbffc1d8be12c64fdc647e3cb5e5c58c (diff) | |
parent | e8a5746f2fcae59bfd18d39b621509b3ef130453 (diff) |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/pulse/thread-mainloop.c')
-rw-r--r-- | src/pulse/thread-mainloop.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c index a2b98ce1..14ed9264 100644 --- a/src/pulse/thread-mainloop.c +++ b/src/pulse/thread-mainloop.c @@ -51,7 +51,7 @@ struct pa_threaded_mainloop { pa_mainloop *real_mainloop; - int n_waiting, n_waiting_for_accept; + volatile int n_waiting, n_waiting_for_accept; pa_thread* thread; pa_mutex* mutex; @@ -185,6 +185,7 @@ void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m) { pa_mutex_unlock(m->mutex); } +/* Called with the lock taken */ void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_accept) { pa_assert(m); @@ -198,6 +199,7 @@ void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_accept) { } } +/* Called with the lock taken */ void pa_threaded_mainloop_wait(pa_threaded_mainloop *m) { pa_assert(m); @@ -212,6 +214,7 @@ void pa_threaded_mainloop_wait(pa_threaded_mainloop *m) { m->n_waiting --; } +/* Called with the lock taken */ void pa_threaded_mainloop_accept(pa_threaded_mainloop *m) { pa_assert(m); |