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/glib-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/glib-mainloop.h')
-rw-r--r-- | src/pulse/glib-mainloop.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pulse/glib-mainloop.h b/src/pulse/glib-mainloop.h index 189513a8..67aba27d 100644 --- a/src/pulse/glib-mainloop.h +++ b/src/pulse/glib-mainloop.h @@ -56,7 +56,9 @@ pa_glib_mainloop *pa_glib_mainloop_new(GMainContext *c); /** Free the GLIB main loop object */ void pa_glib_mainloop_free(pa_glib_mainloop* g); -/** Return the abstract main loop API vtable for the GLIB main loop object */ +/** Return the abstract main loop API vtable for the GLIB main loop + object. No need of freeing the API as it is owned by the loop and + it is destroyed when this dies */ pa_mainloop_api* pa_glib_mainloop_get_api(pa_glib_mainloop *g); PA_C_DECL_END |