diff options
| author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-07-30 23:43:45 +0100 |
|---|---|---|
| committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-07-30 23:43:45 +0100 |
| commit | b30a5d601eaffd98914ca0b9fdecd863eade0b4f (patch) | |
| tree | 2bf5dfaa46b8e1733311562dba299709a0a3228e /src/pulse/context.h | |
| parent | 0e1936fd56ad51509424f3eca06fe3a442b4dc9c (diff) | |
| parent | 0b428e7cb1efdd7330b89a9855f08c45bfa98307 (diff) | |
Merge branch 'master' of git://git.0pointer.de/pulseaudio
Diffstat (limited to 'src/pulse/context.h')
| -rw-r--r-- | src/pulse/context.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/pulse/context.h b/src/pulse/context.h index 8dff7642..3b513976 100644 --- a/src/pulse/context.h +++ b/src/pulse/context.h @@ -35,7 +35,7 @@ * \section overv_sec Overview * * The asynchronous API is the native interface to the PulseAudio library. - * It allows full access to all available functions. This also means that + * It allows full access to all available functionality. This however means that * it is rather complex and can take some time to fully master. * * \section mainloop_sec Main Loop Abstraction @@ -64,8 +64,7 @@ * implementation where all of PulseAudio's * internal handling runs in a separate * thread. - * \li \subpage glib-mainloop - A wrapper around GLIB's main loop. Available - * for both GLIB 1.2 and GLIB 2.x. + * \li \subpage glib-mainloop - A wrapper around GLib's main loop. * * UNIX signals may be hooked to a main loop using the functions from * \ref mainloop-signal.h. These rely only on the main loop abstraction |