mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-08 13:29:59 -05:00
device-restore: Change the API to include type information (sink vs. source)
This changes the API, but as we have not released yet, this is OK.
This commit is contained in:
Colin Guthrie
parent
9600d0c4b1
commit
d6b9e61b90
5 changed files with 77 additions and 32 deletions
|
|
@ -42,9 +42,9 @@ enum {
|
|||
SUBCOMMAND_TEST,
|
||||
SUBCOMMAND_SUBSCRIBE,
|
||||
SUBCOMMAND_EVENT,
|
||||
SUBCOMMAND_READ_SINK_FORMATS_ALL,
|
||||
SUBCOMMAND_READ_SINK_FORMATS,
|
||||
SUBCOMMAND_SAVE_SINK_FORMATS
|
||||
SUBCOMMAND_READ_FORMATS_ALL,
|
||||
SUBCOMMAND_READ_FORMATS,
|
||||
SUBCOMMAND_SAVE_FORMATS
|
||||
};
|
||||
|
||||
static void ext_device_restore_test_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
|
||||
|
|
@ -175,13 +175,24 @@ static void ext_device_restore_read_device_formats_cb(pa_pdispatch *pd, uint32_t
|
|||
pa_ext_device_restore_info i;
|
||||
pa_zero(i);
|
||||
|
||||
if (pa_tagstruct_getu32(t, &i.index) < 0 ||
|
||||
if (pa_tagstruct_getu32(t, &i.type) < 0 ||
|
||||
pa_tagstruct_getu32(t, &i.index) < 0 ||
|
||||
pa_tagstruct_getu8(t, &i.n_formats) < 0) {
|
||||
|
||||
pa_context_fail(o->context, PA_ERR_PROTOCOL);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (PA_DEVICE_TYPE_SINK != i.type && PA_DEVICE_TYPE_SOURCE != i.type) {
|
||||
pa_context_fail(o->context, PA_ERR_PROTOCOL);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (i.index == PA_INVALID_INDEX) {
|
||||
pa_context_fail(o->context, PA_ERR_PROTOCOL);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (i.n_formats > 0) {
|
||||
i.formats = pa_xnew0(pa_format_info*, i.n_formats);
|
||||
|
||||
|
|
@ -221,7 +232,7 @@ finish:
|
|||
pa_operation_unref(o);
|
||||
}
|
||||
|
||||
pa_operation *pa_ext_device_restore_read_sink_formats_all(
|
||||
pa_operation *pa_ext_device_restore_read_formats_all(
|
||||
pa_context *c,
|
||||
pa_ext_device_restore_read_device_formats_cb_t cb,
|
||||
void *userdata) {
|
||||
|
|
@ -242,15 +253,16 @@ pa_operation *pa_ext_device_restore_read_sink_formats_all(
|
|||
t = pa_tagstruct_command(c, PA_COMMAND_EXTENSION, &tag);
|
||||
pa_tagstruct_putu32(t, PA_INVALID_INDEX);
|
||||
pa_tagstruct_puts(t, "module-device-restore");
|
||||
pa_tagstruct_putu32(t, SUBCOMMAND_READ_SINK_FORMATS_ALL);
|
||||
pa_tagstruct_putu32(t, SUBCOMMAND_READ_FORMATS_ALL);
|
||||
pa_pstream_send_tagstruct(c->pstream, t);
|
||||
pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, ext_device_restore_read_device_formats_cb, pa_operation_ref(o), (pa_free_cb_t) pa_operation_unref);
|
||||
|
||||
return o;
|
||||
}
|
||||
|
||||
pa_operation *pa_ext_device_restore_read_sink_formats(
|
||||
pa_operation *pa_ext_device_restore_read_formats(
|
||||
pa_context *c,
|
||||
pa_device_type_t type,
|
||||
uint32_t idx,
|
||||
pa_ext_device_restore_read_device_formats_cb_t cb,
|
||||
void *userdata) {
|
||||
|
|
@ -272,7 +284,8 @@ pa_operation *pa_ext_device_restore_read_sink_formats(
|
|||
t = pa_tagstruct_command(c, PA_COMMAND_EXTENSION, &tag);
|
||||
pa_tagstruct_putu32(t, PA_INVALID_INDEX);
|
||||
pa_tagstruct_puts(t, "module-device-restore");
|
||||
pa_tagstruct_putu32(t, SUBCOMMAND_READ_SINK_FORMATS);
|
||||
pa_tagstruct_putu32(t, SUBCOMMAND_READ_FORMATS);
|
||||
pa_tagstruct_putu32(t, type);
|
||||
pa_tagstruct_putu32(t, idx);
|
||||
pa_pstream_send_tagstruct(c->pstream, t);
|
||||
pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, ext_device_restore_read_device_formats_cb, pa_operation_ref(o), (pa_free_cb_t) pa_operation_unref);
|
||||
|
|
@ -280,8 +293,9 @@ pa_operation *pa_ext_device_restore_read_sink_formats(
|
|||
return o;
|
||||
}
|
||||
|
||||
pa_operation *pa_ext_device_restore_save_sink_formats(
|
||||
pa_operation *pa_ext_device_restore_save_formats(
|
||||
pa_context *c,
|
||||
pa_device_type_t type,
|
||||
uint32_t idx,
|
||||
uint8_t n_formats,
|
||||
pa_format_info **formats,
|
||||
|
|
@ -308,8 +322,9 @@ pa_operation *pa_ext_device_restore_save_sink_formats(
|
|||
t = pa_tagstruct_command(c, PA_COMMAND_EXTENSION, &tag);
|
||||
pa_tagstruct_putu32(t, PA_INVALID_INDEX);
|
||||
pa_tagstruct_puts(t, "module-device-restore");
|
||||
pa_tagstruct_putu32(t, SUBCOMMAND_SAVE_SINK_FORMATS);
|
||||
pa_tagstruct_putu32(t, SUBCOMMAND_SAVE_FORMATS);
|
||||
|
||||
pa_tagstruct_putu32(t, type);
|
||||
pa_tagstruct_putu32(t, idx);
|
||||
pa_tagstruct_putu8(t, n_formats);
|
||||
for (j = 0; j < n_formats; j++)
|
||||
|
|
@ -324,6 +339,7 @@ pa_operation *pa_ext_device_restore_save_sink_formats(
|
|||
/* Command function defined in internal.h */
|
||||
void pa_ext_device_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t) {
|
||||
uint32_t subcommand;
|
||||
pa_device_type_t type;
|
||||
uint32_t idx;
|
||||
|
||||
pa_assert(c);
|
||||
|
|
@ -331,6 +347,7 @@ void pa_ext_device_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t)
|
|||
pa_assert(t);
|
||||
|
||||
if (pa_tagstruct_getu32(t, &subcommand) < 0 ||
|
||||
pa_tagstruct_getu32(t, &type) < 0 ||
|
||||
pa_tagstruct_getu32(t, &idx) < 0 ||
|
||||
!pa_tagstruct_eof(t)) {
|
||||
|
||||
|
|
@ -343,11 +360,16 @@ void pa_ext_device_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t)
|
|||
return;
|
||||
}
|
||||
|
||||
if (PA_DEVICE_TYPE_SINK != type && PA_DEVICE_TYPE_SOURCE != type) {
|
||||
pa_context_fail(c, PA_ERR_PROTOCOL);
|
||||
return;
|
||||
}
|
||||
|
||||
if (idx == PA_INVALID_INDEX) {
|
||||
pa_context_fail(c, PA_ERR_PROTOCOL);
|
||||
return;
|
||||
}
|
||||
|
||||
if (c->ext_device_restore.callback)
|
||||
c->ext_device_restore.callback(c, idx, c->ext_device_restore.userdata);
|
||||
c->ext_device_restore.callback(c, type, idx, c->ext_device_restore.userdata);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ PA_C_DECL_BEGIN
|
|||
/** Stores information about one device in the device database that is
|
||||
* maintained by module-device-manager. \since 1.0 */
|
||||
typedef struct pa_ext_device_restore_info {
|
||||
pa_device_type_t type; /**< Device type sink or source? */
|
||||
uint32_t index; /**< The device index */
|
||||
uint8_t n_formats; /**< How many formats do we have? */
|
||||
pa_format_info **formats; /**< An array of formats (may be NULL if n_formats == 0) */
|
||||
|
|
@ -64,6 +65,7 @@ pa_operation *pa_ext_device_restore_subscribe(
|
|||
/** Callback prototype for pa_ext_device_restore_set_subscribe_cb(). \since 1.0 */
|
||||
typedef void (*pa_ext_device_restore_subscribe_cb_t)(
|
||||
pa_context *c,
|
||||
pa_device_type_t type,
|
||||
uint32_t idx,
|
||||
void *userdata);
|
||||
|
||||
|
|
@ -74,29 +76,31 @@ void pa_ext_device_restore_set_subscribe_cb(
|
|||
pa_ext_device_restore_subscribe_cb_t cb,
|
||||
void *userdata);
|
||||
|
||||
/** Callback prototype for pa_ext_device_restore_read_sink_formats(). \since 1.0 */
|
||||
/** Callback prototype for pa_ext_device_restore_read_formats(). \since 1.0 */
|
||||
typedef void (*pa_ext_device_restore_read_device_formats_cb_t)(
|
||||
pa_context *c,
|
||||
const pa_ext_device_restore_info *info,
|
||||
int eol,
|
||||
void *userdata);
|
||||
|
||||
/** Read the formats for all present sinks from the device database. \since 1.0 */
|
||||
pa_operation *pa_ext_device_restore_read_sink_formats_all(
|
||||
/** Read the formats for all present devices from the device database. \since 1.0 */
|
||||
pa_operation *pa_ext_device_restore_read_formats_all(
|
||||
pa_context *c,
|
||||
pa_ext_device_restore_read_device_formats_cb_t cb,
|
||||
void *userdata);
|
||||
|
||||
/** Read an entry from the device database. \since 1.0 */
|
||||
pa_operation *pa_ext_device_restore_read_sink_formats(
|
||||
pa_operation *pa_ext_device_restore_read_formats(
|
||||
pa_context *c,
|
||||
pa_device_type_t type,
|
||||
uint32_t idx,
|
||||
pa_ext_device_restore_read_device_formats_cb_t cb,
|
||||
void *userdata);
|
||||
|
||||
/** Read an entry from the device database. \since 1.0 */
|
||||
pa_operation *pa_ext_device_restore_save_sink_formats(
|
||||
pa_operation *pa_ext_device_restore_save_formats(
|
||||
pa_context *c,
|
||||
pa_device_type_t type,
|
||||
uint32_t idx,
|
||||
uint8_t n_formats,
|
||||
pa_format_info **formats,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue