diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
| commit | 019331d25b6af107fb8cacc3ada552e7567a64bf (patch) | |
| tree | d5545e795e164fb6cd8edae1a45e7b8bb966ee12 /src/pulse/context.h | |
| parent | 587131917f9129c8347c789febb7e755dfb091de (diff) | |
| parent | afd1b6d355ef1a41cb3592485855e273a5de69c1 (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
Diffstat (limited to 'src/pulse/context.h')
| -rw-r--r-- | src/pulse/context.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/pulse/context.h b/src/pulse/context.h index cd129313..ecff58df 100644 --- a/src/pulse/context.h +++ b/src/pulse/context.h @@ -147,12 +147,6 @@ * server. A pa_context object wraps a connection to a PulseAudio * server using its native protocol. */ -/** \example pacat.c - * A playback and recording tool using the asynchronous API */ - -/** \example paplay.c - * A sound file playback tool using the asynchronous API, based on libsndfile */ - PA_C_DECL_BEGIN /** An opaque connection context to a daemon */ @@ -267,7 +261,6 @@ pa_time_event* pa_context_rttime_new(pa_context *c, pa_usec_t usec, pa_time_even for mainloop->time_restart). \since 0.9.16 */ void pa_context_rttime_restart(pa_context *c, pa_time_event *e, pa_usec_t usec); - PA_C_DECL_END #endif |