diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-24 14:43:11 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-24 14:43:11 +0300 |
| commit | 2f3fc2f1d6ba418303a4bab6f8fd3caed7d291b4 (patch) | |
| tree | 00bccb466ce49367f6fd54fe9f7f90557eea8738 /src/pulse/mainloop.h | |
| parent | 3025645b0b58f476f6404f2aed3b61a633794d10 (diff) | |
| parent | be46eaa5b6324d84c5ecbed5dd72dec1c87e0cb1 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/Makefile.am
Diffstat (limited to 'src/pulse/mainloop.h')
| -rw-r--r-- | src/pulse/mainloop.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pulse/mainloop.h b/src/pulse/mainloop.h index 4a83ebe8..63abd588 100644 --- a/src/pulse/mainloop.h +++ b/src/pulse/mainloop.h @@ -108,7 +108,9 @@ int pa_mainloop_iterate(pa_mainloop *m, int block, int *retval); /** Run unlimited iterations of the main loop object until the main loop's quit() routine is called. */ int pa_mainloop_run(pa_mainloop *m, int *retval); -/** Return the abstract main loop abstraction layer vtable for this main loop. */ +/** Return the abstract main loop abstraction layer vtable for this + main loop. No need of freeing the API as it is owned by the loop + and it is destroyed when this dies */ pa_mainloop_api* pa_mainloop_get_api(pa_mainloop*m); /** Shutdown the main loop */ |