Skip to content

Commit 382798a

Browse files
committed
includes: update to PA v15 copy
note, during PA v15 development, a `message-params.h` header was added, but then replaced with `json.h`, and then that itself was ultimately dropped.
1 parent 23feae4 commit 382798a

File tree

4 files changed

+30
-8
lines changed

4 files changed

+30
-8
lines changed

includes/gccmacro.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525

2626
#if defined(__GNUC__)
2727
#ifdef __MINGW32__
28-
/* libintl overrides printf with a #define. As this breaks this attribute,
29-
* it has a workaround. However the workaround isn't enabled for MINGW
30-
* builds (only cygwin) */
31-
#define PA_GCC_PRINTF_ATTR(a,b) __attribute__ ((format (__printf__, a, b)))
28+
#include <stdio.h>
29+
#define PA_GCC_PRINTF_ATTR(a,b) __attribute__ ((format (__MINGW_PRINTF_FORMAT, a, b)))
3230
#else
3331
#define PA_GCC_PRINTF_ATTR(a,b) __attribute__ ((format (printf, a, b)))
3432
#endif

includes/introspect.h

+17
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,12 @@
204204
* Server modules can be remotely loaded and unloaded using
205205
* pa_context_load_module() and pa_context_unload_module().
206206
*
207+
* \subsection message_subsec Messages
208+
*
209+
* Server objects like sinks, sink inputs or modules can register a message
210+
* handler to communicate with clients. A message can be sent to a named
211+
* message handler using pa_context_send_message_to_object().
212+
*
207213
* \subsection client_subsec Clients
208214
*
209215
* The only operation supported on clients is the possibility of kicking
@@ -489,6 +495,17 @@ pa_operation* pa_context_unload_module(pa_context *c, uint32_t idx, pa_context_s
489495

490496
/** @} */
491497

498+
/** @{ \name Messages */
499+
500+
/** Callback prototype for pa_context_send_message_to_object() \since 15.0 */
501+
typedef void (*pa_context_string_cb_t)(pa_context *c, int success, char *response, void *userdata);
502+
503+
/** Send a message to an object that registered a message handler. For more information
504+
* see https://cgit.freedesktop.org/pulseaudio/pulseaudio/tree/doc/messaging_api.txt. \since 15.0 */
505+
pa_operation* pa_context_send_message_to_object(pa_context *c, const char *recipient_name, const char *message, const char *message_parameters, pa_context_string_cb_t cb, void *userdata);
506+
507+
/** @} */
508+
492509
/** @{ \name Clients */
493510

494511
/** Stores information about clients. Please note that this structure

includes/proplist.h

+8-1
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,12 @@ PA_C_DECL_BEGIN
267267
/** For PCM formats: the channel map of the stream as returned by pa_channel_map_snprint() \since 1.0 */
268268
#define PA_PROP_FORMAT_CHANNEL_MAP "format.channel_map"
269269

270+
/** For context: whether to forcefully disable data transfer via POSIX or memfd shared memory. This property overrides any other client configuration which would otherwise enable SHM communication channels. \since 15.0 */
271+
#define PA_PROP_CONTEXT_FORCE_DISABLE_SHM "context.force.disable.shm"
272+
273+
/** For a bluez device: the currently selected codec name. \since 15.0 */
274+
#define PA_PROP_BLUETOOTH_CODEC "bluetooth.codec"
275+
270276
/** A property list object. Basically a dictionary with ASCII strings
271277
* as keys and arbitrary data as values. \since 0.9.11 */
272278
typedef struct pa_proplist pa_proplist;
@@ -316,7 +322,8 @@ const char *pa_proplist_gets(const pa_proplist *p, const char *key);
316322
/** Store the value for the specified key in \a data. Will store a
317323
* NUL-terminated string for string entries. The \a data pointer returned will
318324
* point to an internally allocated buffer. The caller should make a
319-
* copy of the data before the property list is accessed again.
325+
* copy of the data before any subsequent modification or destruction
326+
* of the property list.
320327
* Returns zero on success, negative on error. \since 0.9.11 */
321328
int pa_proplist_get(const pa_proplist *p, const char *key, const void **data, size_t *nbytes);
322329

includes/version.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PA_C_DECL_BEGIN
3333
/** Return the version of the header files. Keep in mind that this is
3434
a macro and not a function, so it is impossible to get the pointer of
3535
it. */
36-
#define pa_get_headers_version() ("14.0.0")
36+
#define pa_get_headers_version() ("15.0.0")
3737

3838
/** Return the version of the library the current application is
3939
* linked to. */
@@ -47,10 +47,10 @@ const char* pa_get_library_version(void);
4747

4848
/** The current protocol version. Version 8 relates to Polypaudio
4949
* 0.8/PulseAudio 0.9. */
50-
#define PA_PROTOCOL_VERSION 34
50+
#define PA_PROTOCOL_VERSION 35
5151

5252
/** The major version of PA. \since 0.9.15 */
53-
#define PA_MAJOR 14
53+
#define PA_MAJOR 15
5454

5555
/** The minor version of PA. \since 0.9.15 */
5656
#define PA_MINOR 0

0 commit comments

Comments
 (0)