src/map-file | 6 -
src/modules/dbus/iface-device.c | 117 +++++++++++++++++-------------------
src/modules/module-device-restore.c | 43 +++++++++----
src/pulse/def.h | 11 +++
src/pulse/ext-device-restore.c | 44 ++++++++++---
src/pulse/ext-device-restore.h | 14 ++--
src/utils/pactl.c | 2
7 files changed, 144 insertions(+), 93 deletions(-)
New commits:
commit d6b9e61b90c4b242fa6dcff4f258c62213e18a47
Author: Colin Guthrie <co...@mageia.org>
Date: Thu Aug 18 16:37:54 2011 +0100
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.
diff --git a/src/map-file b/src/map-file
index dd2e7d9..903f0bd 100644
--- a/src/map-file
+++ b/src/map-file
@@ -151,9 +151,9 @@ pa_ext_device_manager_set_device_description;
pa_ext_device_manager_set_subscribe_cb;
pa_ext_device_manager_subscribe;
pa_ext_device_manager_test;
-pa_ext_device_restore_read_sink_formats;
-pa_ext_device_restore_read_sink_formats_all;
-pa_ext_device_restore_save_sink_formats;
+pa_ext_device_restore_read_formats;
+pa_ext_device_restore_read_formats_all;
+pa_ext_device_restore_save_formats;
pa_ext_device_restore_set_subscribe_cb;
pa_ext_device_restore_subscribe;
pa_ext_device_restore_test;
diff --git a/src/modules/module-device-restore.c
b/src/modules/module-device-restore.c
index 914febe..2973b1b 100644
--- a/src/modules/module-device-restore.c
+++ b/src/modules/module-device-restore.c
@@ -104,9 +104,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
};
@@ -137,7 +137,7 @@ static void save_time_callback(pa_mainloop_api*a,
pa_time_event* e, const struct
pa_log_info("Synced.");
}
-static void trigger_save(struct userdata *u, uint32_t sink_idx) {
+static void trigger_save(struct userdata *u, pa_device_type_t type, uint32_t
sink_idx) {
pa_native_connection *c;
uint32_t idx;
@@ -151,6 +151,7 @@ static void trigger_save(struct userdata *u, uint32_t
sink_idx) {
pa_tagstruct_putu32(t, u->module->index);
pa_tagstruct_puts(t, u->module->name);
pa_tagstruct_putu32(t, SUBCOMMAND_EVENT);
+ pa_tagstruct_putu32(t, type);
pa_tagstruct_putu32(t, sink_idx);
pa_pstream_send_tagstruct(pa_native_connection_get_pstream(c), t);
@@ -360,7 +361,7 @@ fail:
if ((e = legacy_entry_read(u, &data))) {
pa_log_debug("Success. Saving new format for key: %s", name);
if (entry_write(u, name, e))
- trigger_save(u, PA_INVALID_INDEX);
+ trigger_save(u, PA_DEVICE_TYPE_SINK, PA_INVALID_INDEX);
pa_datum_free(&data);
return e;
} else
@@ -421,6 +422,7 @@ static void subscribe_callback(pa_core *c,
pa_subscription_event_type_t t, uint3
struct userdata *u = userdata;
struct entry *entry, *old;
char *name;
+ pa_device_type_t type;
pa_assert(c);
pa_assert(u);
@@ -437,6 +439,7 @@ static void subscribe_callback(pa_core *c,
pa_subscription_event_type_t t, uint3
if (!(sink = pa_idxset_get_by_index(c->sinks, idx)))
return;
+ type = PA_DEVICE_TYPE_SINK;
name = pa_sprintf_malloc("sink:%s", sink->name);
if ((old = entry_read(u, name)))
@@ -469,6 +472,7 @@ static void subscribe_callback(pa_core *c,
pa_subscription_event_type_t t, uint3
if (!(source = pa_idxset_get_by_index(c->sources, idx)))
return;
+ type = PA_DEVICE_TYPE_SOURCE;
name = pa_sprintf_malloc("source:%s", source->name);
if ((old = entry_read(u, name)))
@@ -511,7 +515,7 @@ static void subscribe_callback(pa_core *c,
pa_subscription_event_type_t t, uint3
pa_log_info("Storing volume/mute/port for device %s.", name);
if (entry_write(u, name, entry))
- trigger_save(u, idx);
+ trigger_save(u, type, idx);
entry_free(entry);
pa_xfree(name);
@@ -705,6 +709,7 @@ static void read_sink_format_reply(struct userdata *u,
pa_tagstruct *reply, pa_s
pa_assert(reply);
pa_assert(sink);
+ pa_tagstruct_putu32(reply, PA_DEVICE_TYPE_SINK);
pa_tagstruct_putu32(reply, sink->index);
/* Read or create an entry */
@@ -775,7 +780,7 @@ static int extension_cb(pa_native_protocol *p, pa_module
*m, pa_native_connectio
break;
}
- case SUBCOMMAND_READ_SINK_FORMATS_ALL: {
+ case SUBCOMMAND_READ_FORMATS_ALL: {
pa_sink *sink;
uint32_t idx;
@@ -788,16 +793,23 @@ static int extension_cb(pa_native_protocol *p, pa_module
*m, pa_native_connectio
break;
}
- case SUBCOMMAND_READ_SINK_FORMATS: {
+ case SUBCOMMAND_READ_FORMATS: {
+ pa_device_type_t type;
uint32_t sink_index;
pa_sink *sink;
pa_assert(reply);
/* Get the sink index and the number of formats from the tagstruct
*/
- if (pa_tagstruct_getu32(t, &sink_index) < 0)
+ if (pa_tagstruct_getu32(t, &type) < 0 ||
+ pa_tagstruct_getu32(t, &sink_index) < 0)
goto fail;
+ if (type != PA_DEVICE_TYPE_SINK) {
+ pa_log("Device format reading is only supported on sinks");
+ goto fail;
+ }
+
if (!pa_tagstruct_eof(t))
goto fail;
@@ -810,21 +822,28 @@ static int extension_cb(pa_native_protocol *p, pa_module
*m, pa_native_connectio
break;
}
- case SUBCOMMAND_SAVE_SINK_FORMATS: {
+ case SUBCOMMAND_SAVE_FORMATS: {
struct entry *e;
+ pa_device_type_t type;
uint32_t sink_index;
char *name;
pa_sink *sink;
uint8_t i, n_formats;
/* Get the sink index and the number of formats from the tagstruct
*/
- if (pa_tagstruct_getu32(t, &sink_index) < 0 ||
+ if (pa_tagstruct_getu32(t, &type) < 0 ||
+ pa_tagstruct_getu32(t, &sink_index) < 0 ||
pa_tagstruct_getu8(t, &n_formats) < 0 || n_formats < 1) {
goto fail;
}
+ if (type != PA_DEVICE_TYPE_SINK) {
+ pa_log("Device format saving is only supported on sinks");
+ goto fail;
+ }
+
/* Now find our sink */
if (!(sink = pa_idxset_get_by_index(u->core->sinks, sink_index))) {
pa_log("Could not find sink #%d", sink_index);
@@ -859,7 +878,7 @@ static int extension_cb(pa_native_protocol *p, pa_module
*m, pa_native_connectio
}
if (pa_sink_set_formats(sink, e->formats) && entry_write(u, name,
e))
- trigger_save(u, sink_index);
+ trigger_save(u, type, sink_index);
else
pa_log_warn("Could not save format info for sink %s",
sink->name);
diff --git a/src/pulse/ext-device-restore.c b/src/pulse/ext-device-restore.c
index 3cbbe1a..fdfaf29 100644
--- a/src/pulse/ext-device-restore.c
+++ b/src/pulse/ext-device-restore.c
@@ -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);
}
diff --git a/src/pulse/ext-device-restore.h b/src/pulse/ext-device-restore.h
index 65dab43..e6857f4 100644
--- a/src/pulse/ext-device-restore.h
+++ b/src/pulse/ext-device-restore.h
@@ -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,
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index b35e397..b1a0064 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -909,7 +909,7 @@ static void set_sink_formats(pa_context *c, uint32_t sink,
const char *str) {
pa_xfree(format);
}
- pa_operation_unref(pa_ext_device_restore_save_sink_formats(c, sink, i,
f_arr, simple_callback, NULL));
+ pa_operation_unref(pa_ext_device_restore_save_formats(c,
PA_DEVICE_TYPE_SINK, sink, i, f_arr, simple_callback, NULL));
done:
if (format)
commit 9600d0c4b1c726c3aec31c69b0ebbdf701d05194
Author: Colin Guthrie <co...@mageia.org>
Date: Thu Aug 18 15:40:15 2011 +0100
dbus: Use pa_device_type_t rather than an internal equivalent
diff --git a/src/modules/dbus/iface-device.c b/src/modules/dbus/iface-device.c
index 652790f..df64d36 100644
--- a/src/modules/dbus/iface-device.c
+++ b/src/modules/dbus/iface-device.c
@@ -76,11 +76,6 @@ static void handle_source_get_monitor_of_sink(DBusConnection
*conn, DBusMessage
static void handle_source_get_all(DBusConnection *conn, DBusMessage *msg, void
*userdata);
-enum device_type {
- DEVICE_TYPE_SINK,
- DEVICE_TYPE_SOURCE
-};
-
struct pa_dbusiface_device {
pa_dbusiface_core *core;
@@ -88,7 +83,7 @@ struct pa_dbusiface_device {
pa_sink *sink;
pa_source *source;
};
- enum device_type type;
+ pa_device_type_t type;
char *path;
pa_cvolume volume;
dbus_bool_t mute;
@@ -266,7 +261,7 @@ static void handle_get_index(DBusConnection *conn,
DBusMessage *msg, void *userd
pa_assert(msg);
pa_assert(d);
- idx = (d->type == DEVICE_TYPE_SINK) ? d->sink->index : d->source->index;
+ idx = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->index : d->source->index;
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &idx);
}
@@ -279,7 +274,7 @@ static void handle_get_name(DBusConnection *conn,
DBusMessage *msg, void *userda
pa_assert(msg);
pa_assert(d);
- name = (d->type == DEVICE_TYPE_SINK) ? d->sink->name : d->source->name;
+ name = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->name : d->source->name;
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &name);
}
@@ -292,7 +287,7 @@ static void handle_get_driver(DBusConnection *conn,
DBusMessage *msg, void *user
pa_assert(msg);
pa_assert(d);
- driver = (d->type == DEVICE_TYPE_SINK) ? d->sink->driver :
d->source->driver;
+ driver = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->driver :
d->source->driver;
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &driver);
}
@@ -306,10 +301,10 @@ static void handle_get_owner_module(DBusConnection *conn,
DBusMessage *msg, void
pa_assert(msg);
pa_assert(d);
- owner_module = (d->type == DEVICE_TYPE_SINK) ? d->sink->module :
d->source->module;
+ owner_module = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->module :
d->source->module;
if (!owner_module) {
- if (d->type == DEVICE_TYPE_SINK)
+ if (d->type == PA_DEVICE_TYPE_SINK)
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
"Sink %s doesn't have an owner module.",
d->sink->name);
else
@@ -332,10 +327,10 @@ static void handle_get_card(DBusConnection *conn,
DBusMessage *msg, void *userda
pa_assert(msg);
pa_assert(d);
- card = (d->type == DEVICE_TYPE_SINK) ? d->sink->card : d->source->card;
+ card = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->card : d->source->card;
if (!card) {
- if (d->type == DEVICE_TYPE_SINK)
+ if (d->type == PA_DEVICE_TYPE_SINK)
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
"Sink %s doesn't belong to any card.",
d->sink->name);
else
@@ -357,7 +352,7 @@ static void handle_get_sample_format(DBusConnection *conn,
DBusMessage *msg, voi
pa_assert(msg);
pa_assert(d);
- sample_format = (d->type == DEVICE_TYPE_SINK) ?
d->sink->sample_spec.format : d->source->sample_spec.format;
+ sample_format = (d->type == PA_DEVICE_TYPE_SINK) ?
d->sink->sample_spec.format : d->source->sample_spec.format;
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32,
&sample_format);
}
@@ -370,7 +365,7 @@ static void handle_get_sample_rate(DBusConnection *conn,
DBusMessage *msg, void
pa_assert(msg);
pa_assert(d);
- sample_rate = (d->type == DEVICE_TYPE_SINK) ? d->sink->sample_spec.rate :
d->source->sample_spec.rate;
+ sample_rate = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->sample_spec.rate
: d->source->sample_spec.rate;
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32,
&sample_rate);
}
@@ -385,7 +380,7 @@ static void handle_get_channels(DBusConnection *conn,
DBusMessage *msg, void *us
pa_assert(msg);
pa_assert(d);
- channel_map = (d->type == DEVICE_TYPE_SINK) ? &d->sink->channel_map :
&d->source->channel_map;
+ channel_map = (d->type == PA_DEVICE_TYPE_SINK) ? &d->sink->channel_map :
&d->source->channel_map;
for (i = 0; i < channel_map->channels; ++i)
channels[i] = channel_map->map[i];
@@ -422,7 +417,7 @@ static void handle_set_volume(DBusConnection *conn,
DBusMessage *msg, DBusMessag
pa_assert(iter);
pa_assert(d);
- device_channels = (d->type == DEVICE_TYPE_SINK) ?
d->sink->channel_map.channels : d->source->channel_map.channels;
+ device_channels = (d->type == PA_DEVICE_TYPE_SINK) ?
d->sink->channel_map.channels : d->source->channel_map.channels;
dbus_message_iter_recurse(iter, &array_iter);
dbus_message_iter_get_fixed_array(&array_iter, &volume, &n_volume_entries);
@@ -444,7 +439,7 @@ static void handle_set_volume(DBusConnection *conn,
DBusMessage *msg, DBusMessag
new_vol.values[i] = volume[i];
}
- if (d->type == DEVICE_TYPE_SINK)
+ if (d->type == PA_DEVICE_TYPE_SINK)
pa_sink_set_volume(d->sink, &new_vol, TRUE, TRUE);
else
pa_source_set_volume(d->source, &new_vol, TRUE, TRUE);
@@ -460,7 +455,7 @@ static void handle_get_has_flat_volume(DBusConnection
*conn, DBusMessage *msg, v
pa_assert(msg);
pa_assert(d);
- has_flat_volume = (d->type == DEVICE_TYPE_SINK) ? (d->sink->flags &
PA_SINK_FLAT_VOLUME) : FALSE;
+ has_flat_volume = (d->type == PA_DEVICE_TYPE_SINK) ? (d->sink->flags &
PA_SINK_FLAT_VOLUME) : FALSE;
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN,
&has_flat_volume);
}
@@ -473,7 +468,7 @@ static void
handle_get_has_convertible_to_decibel_volume(DBusConnection *conn, D
pa_assert(msg);
pa_assert(d);
- has_convertible_to_decibel_volume = (d->type == DEVICE_TYPE_SINK)
+ has_convertible_to_decibel_volume = (d->type == PA_DEVICE_TYPE_SINK)
? (d->sink->flags &
PA_SINK_DECIBEL_VOLUME)
: (d->source->flags &
PA_SOURCE_DECIBEL_VOLUME);
@@ -488,7 +483,7 @@ static void handle_get_base_volume(DBusConnection *conn,
DBusMessage *msg, void
pa_assert(msg);
pa_assert(d);
- base_volume = (d->type == DEVICE_TYPE_SINK) ? d->sink->base_volume :
d->source->base_volume;
+ base_volume = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->base_volume :
d->source->base_volume;
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32,
&base_volume);
}
@@ -501,7 +496,7 @@ static void handle_get_volume_steps(DBusConnection *conn,
DBusMessage *msg, void
pa_assert(msg);
pa_assert(d);
- volume_steps = (d->type == DEVICE_TYPE_SINK) ? d->sink->n_volume_steps :
d->source->n_volume_steps;
+ volume_steps = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->n_volume_steps
: d->source->n_volume_steps;
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32,
&volume_steps);
}
@@ -527,7 +522,7 @@ static void handle_set_mute(DBusConnection *conn,
DBusMessage *msg, DBusMessageI
dbus_message_iter_get_basic(iter, &mute);
- if (d->type == DEVICE_TYPE_SINK)
+ if (d->type == PA_DEVICE_TYPE_SINK)
pa_sink_set_mute(d->sink, mute, TRUE);
else
pa_source_set_mute(d->source, mute, TRUE);
@@ -543,7 +538,7 @@ static void handle_get_has_hardware_volume(DBusConnection
*conn, DBusMessage *ms
pa_assert(msg);
pa_assert(d);
- has_hardware_volume = (d->type == DEVICE_TYPE_SINK)
+ has_hardware_volume = (d->type == PA_DEVICE_TYPE_SINK)
? (d->sink->flags & PA_SINK_HW_VOLUME_CTRL)
: (d->source->flags & PA_SOURCE_HW_VOLUME_CTRL);
@@ -558,7 +553,7 @@ static void handle_get_has_hardware_mute(DBusConnection
*conn, DBusMessage *msg,
pa_assert(msg);
pa_assert(d);
- has_hardware_mute = (d->type == DEVICE_TYPE_SINK)
+ has_hardware_mute = (d->type == PA_DEVICE_TYPE_SINK)
? (d->sink->flags & PA_SINK_HW_MUTE_CTRL)
: (d->source->flags & PA_SOURCE_HW_MUTE_CTRL);
@@ -573,7 +568,7 @@ static void handle_get_configured_latency(DBusConnection
*conn, DBusMessage *msg
pa_assert(msg);
pa_assert(d);
- configured_latency = (d->type == DEVICE_TYPE_SINK)
+ configured_latency = (d->type == PA_DEVICE_TYPE_SINK)
? pa_sink_get_requested_latency(d->sink)
: pa_source_get_requested_latency(d->source);
@@ -588,7 +583,7 @@ static void handle_get_has_dynamic_latency(DBusConnection
*conn, DBusMessage *ms
pa_assert(msg);
pa_assert(d);
- has_dynamic_latency = (d->type == DEVICE_TYPE_SINK)
+ has_dynamic_latency = (d->type == PA_DEVICE_TYPE_SINK)
? (d->sink->flags & PA_SINK_DYNAMIC_LATENCY)
: (d->source->flags & PA_SOURCE_DYNAMIC_LATENCY);
@@ -603,15 +598,15 @@ static void handle_get_latency(DBusConnection *conn,
DBusMessage *msg, void *use
pa_assert(msg);
pa_assert(d);
- if (d->type == DEVICE_TYPE_SINK && !(d->sink->flags & PA_SINK_LATENCY))
+ if (d->type == PA_DEVICE_TYPE_SINK && !(d->sink->flags & PA_SINK_LATENCY))
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
"Sink %s doesn't support latency querying.",
d->sink->name);
- else if (d->type == DEVICE_TYPE_SOURCE && !(d->source->flags &
PA_SOURCE_LATENCY))
+ else if (d->type == PA_DEVICE_TYPE_SOURCE && !(d->source->flags &
PA_SOURCE_LATENCY))
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
"Source %s doesn't support latency querying.",
d->source->name);
return;
- latency = (d->type == DEVICE_TYPE_SINK) ? pa_sink_get_latency(d->sink) :
pa_source_get_latency(d->source);
+ latency = (d->type == PA_DEVICE_TYPE_SINK) ? pa_sink_get_latency(d->sink)
: pa_source_get_latency(d->source);
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT64, &latency);
}
@@ -624,7 +619,7 @@ static void handle_get_is_hardware_device(DBusConnection
*conn, DBusMessage *msg
pa_assert(msg);
pa_assert(d);
- is_hardware_device = (d->type == DEVICE_TYPE_SINK)
+ is_hardware_device = (d->type == PA_DEVICE_TYPE_SINK)
? (d->sink->flags & PA_SINK_HARDWARE)
: (d->source->flags & PA_SOURCE_HARDWARE);
@@ -639,7 +634,7 @@ static void handle_get_is_network_device(DBusConnection
*conn, DBusMessage *msg,
pa_assert(msg);
pa_assert(d);
- is_network_device = (d->type == DEVICE_TYPE_SINK)
+ is_network_device = (d->type == PA_DEVICE_TYPE_SINK)
? (d->sink->flags & PA_SINK_NETWORK)
: (d->source->flags & PA_SOURCE_NETWORK);
@@ -654,7 +649,7 @@ static void handle_get_state(DBusConnection *conn,
DBusMessage *msg, void *userd
pa_assert(msg);
pa_assert(d);
- state = (d->type == DEVICE_TYPE_SINK) ? d->sink_state : d->source_state;
+ state = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink_state : d->source_state;
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &state);
}
@@ -709,7 +704,7 @@ static void handle_get_active_port(DBusConnection *conn,
DBusMessage *msg, void
if (!d->active_port) {
pa_assert(pa_hashmap_isempty(d->ports));
- if (d->type == DEVICE_TYPE_SINK)
+ if (d->type == PA_DEVICE_TYPE_SINK)
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
"The sink %s has no ports, and therefore
there's no active port either.", d->sink->name);
else
@@ -737,7 +732,7 @@ static void handle_set_active_port(DBusConnection *conn,
DBusMessage *msg, DBusM
if (!d->active_port) {
pa_assert(pa_hashmap_isempty(d->ports));
- if (d->type == DEVICE_TYPE_SINK)
+ if (d->type == PA_DEVICE_TYPE_SINK)
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
"The sink %s has no ports, and therefore
there's no active port either.", d->sink->name);
else
@@ -753,7 +748,7 @@ static void handle_set_active_port(DBusConnection *conn,
DBusMessage *msg, DBusM
return;
}
- if (d->type == DEVICE_TYPE_SINK) {
+ if (d->type == PA_DEVICE_TYPE_SINK) {
if ((r = pa_sink_set_port(d->sink,
pa_dbusiface_device_port_get_name(new_active), TRUE)) < 0) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED,
"Internal error in PulseAudio:
pa_sink_set_port() failed with error code %i.", r);
@@ -818,7 +813,7 @@ static void handle_get_all(DBusConnection *conn,
DBusMessage *msg, void *userdat
pa_assert(msg);
pa_assert(d);
- if (d->type == DEVICE_TYPE_SINK) {
+ if (d->type == PA_DEVICE_TYPE_SINK) {
idx = d->sink->index;
name = d->sink->name;
driver = d->sink->driver;
@@ -931,10 +926,10 @@ static void handle_suspend(DBusConnection *conn,
DBusMessage *msg, void *userdat
pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_BOOLEAN, &suspend,
DBUS_TYPE_INVALID));
- if ((d->type == DEVICE_TYPE_SINK) && (pa_sink_suspend(d->sink, suspend,
PA_SUSPEND_USER) < 0)) {
+ if ((d->type == PA_DEVICE_TYPE_SINK) && (pa_sink_suspend(d->sink, suspend,
PA_SUSPEND_USER) < 0)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "Internal error in
PulseAudio: pa_sink_suspend() failed.");
return;
- } else if ((d->type == DEVICE_TYPE_SOURCE) &&
(pa_source_suspend(d->source, suspend, PA_SUSPEND_USER) < 0)) {
+ } else if ((d->type == PA_DEVICE_TYPE_SOURCE) &&
(pa_source_suspend(d->source, suspend, PA_SUSPEND_USER) < 0)) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED, "Internal error in
PulseAudio: pa_source_suspend() failed.");
return;
}
@@ -955,7 +950,7 @@ static void handle_get_port_by_name(DBusConnection *conn,
DBusMessage *msg, void
pa_assert_se(dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING,
&port_name, DBUS_TYPE_INVALID));
if (!(port = pa_hashmap_get(d->ports, port_name))) {
- if (d->type == DEVICE_TYPE_SINK)
+ if (d->type == PA_DEVICE_TYPE_SINK)
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NOT_FOUND,
"%s: No such port on sink %s.", port_name,
d->sink->name);
else
@@ -976,7 +971,7 @@ static void handle_sink_get_monitor_source(DBusConnection
*conn, DBusMessage *ms
pa_assert(conn);
pa_assert(msg);
pa_assert(d);
- pa_assert(d->type == DEVICE_TYPE_SINK);
+ pa_assert(d->type == PA_DEVICE_TYPE_SINK);
monitor_source = pa_dbusiface_core_get_source_path(d->core,
d->sink->monitor_source);
@@ -993,7 +988,7 @@ static void handle_sink_get_all(DBusConnection *conn,
DBusMessage *msg, void *us
pa_assert(conn);
pa_assert(msg);
pa_assert(d);
- pa_assert(d->type == DEVICE_TYPE_SINK);
+ pa_assert(d->type == PA_DEVICE_TYPE_SINK);
monitor_source = pa_dbusiface_core_get_source_path(d->core,
d->sink->monitor_source);
@@ -1018,7 +1013,7 @@ static void
handle_source_get_monitor_of_sink(DBusConnection *conn, DBusMessage
pa_assert(conn);
pa_assert(msg);
pa_assert(d);
- pa_assert(d->type == DEVICE_TYPE_SOURCE);
+ pa_assert(d->type == PA_DEVICE_TYPE_SOURCE);
if (!d->source->monitor_of) {
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "Source
%s is not a monitor source.", d->source->name);
@@ -1040,7 +1035,7 @@ static void handle_source_get_all(DBusConnection *conn,
DBusMessage *msg, void *
pa_assert(conn);
pa_assert(msg);
pa_assert(d);
- pa_assert(d->type == DEVICE_TYPE_SOURCE);
+ pa_assert(d->type == PA_DEVICE_TYPE_SOURCE);
if (d->source->monitor_of)
monitor_of_sink = pa_dbusiface_core_get_sink_path(d->core,
d->source->monitor_of);
@@ -1074,18 +1069,18 @@ static void subscription_cb(pa_core *c,
pa_subscription_event_type_t t, uint32_t
pa_assert(c);
pa_assert(d);
- if ((d->type == DEVICE_TYPE_SINK && idx != d->sink->index) || (d->type ==
DEVICE_TYPE_SOURCE && idx != d->source->index))
+ if ((d->type == PA_DEVICE_TYPE_SINK && idx != d->sink->index) || (d->type
== PA_DEVICE_TYPE_SOURCE && idx != d->source->index))
return;
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
return;
- pa_assert(((d->type == DEVICE_TYPE_SINK)
+ pa_assert(((d->type == PA_DEVICE_TYPE_SINK)
&& ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) ==
PA_SUBSCRIPTION_EVENT_SINK))
- || ((d->type == DEVICE_TYPE_SOURCE)
+ || ((d->type == PA_DEVICE_TYPE_SOURCE)
&& ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) ==
PA_SUBSCRIPTION_EVENT_SOURCE)));
- new_volume = (d->type == DEVICE_TYPE_SINK)
+ new_volume = (d->type == PA_DEVICE_TYPE_SINK)
? pa_sink_get_volume(d->sink, FALSE)
: pa_source_get_volume(d->source, FALSE);
@@ -1110,7 +1105,7 @@ static void subscription_cb(pa_core *c,
pa_subscription_event_type_t t, uint32_t
signal_msg = NULL;
}
- new_mute = (d->type == DEVICE_TYPE_SINK) ? pa_sink_get_mute(d->sink,
FALSE) : pa_source_get_mute(d->source, FALSE);
+ new_mute = (d->type == PA_DEVICE_TYPE_SINK) ? pa_sink_get_mute(d->sink,
FALSE) : pa_source_get_mute(d->source, FALSE);
if (d->mute != new_mute) {
d->mute = new_mute;
@@ -1125,21 +1120,21 @@ static void subscription_cb(pa_core *c,
pa_subscription_event_type_t t, uint32_t
signal_msg = NULL;
}
- if (d->type == DEVICE_TYPE_SINK)
+ if (d->type == PA_DEVICE_TYPE_SINK)
new_sink_state = pa_sink_get_state(d->sink);
else
new_source_state = pa_source_get_state(d->source);
- if ((d->type == DEVICE_TYPE_SINK && d->sink_state != new_sink_state)
- || (d->type == DEVICE_TYPE_SOURCE && d->source_state !=
new_source_state)) {
+ if ((d->type == PA_DEVICE_TYPE_SINK && d->sink_state != new_sink_state)
+ || (d->type == PA_DEVICE_TYPE_SOURCE && d->source_state !=
new_source_state)) {
dbus_uint32_t state = 0;
- if (d->type == DEVICE_TYPE_SINK)
+ if (d->type == PA_DEVICE_TYPE_SINK)
d->sink_state = new_sink_state;
else
d->source_state = new_source_state;
- state = (d->type == DEVICE_TYPE_SINK) ? d->sink_state :
d->source_state;
+ state = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink_state :
d->source_state;
pa_assert_se(signal_msg = dbus_message_new_signal(d->path,
PA_DBUSIFACE_DEVICE_INTERFACE,
@@ -1151,7 +1146,7 @@ static void subscription_cb(pa_core *c,
pa_subscription_event_type_t t, uint32_t
signal_msg = NULL;
}
- new_active_port = (d->type == DEVICE_TYPE_SINK) ? d->sink->active_port :
d->source->active_port;
+ new_active_port = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->active_port
: d->source->active_port;
if (d->active_port != new_active_port) {
const char *object_path = NULL;
@@ -1169,7 +1164,7 @@ static void subscription_cb(pa_core *c,
pa_subscription_event_type_t t, uint32_t
signal_msg = NULL;
}
- new_proplist = (d->type == DEVICE_TYPE_SINK) ? d->sink->proplist :
d->source->proplist;
+ new_proplist = (d->type == PA_DEVICE_TYPE_SINK) ? d->sink->proplist :
d->source->proplist;
if (!pa_proplist_equal(d->proplist, new_proplist)) {
DBusMessageIter msg_iter;
@@ -1197,7 +1192,7 @@ pa_dbusiface_device
*pa_dbusiface_device_new_sink(pa_dbusiface_core *core, pa_si
d = pa_xnew0(pa_dbusiface_device, 1);
d->core = core;
d->sink = pa_sink_ref(sink);
- d->type = DEVICE_TYPE_SINK;
+ d->type = PA_DEVICE_TYPE_SINK;
d->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH,
SINK_OBJECT_NAME, sink->index);
d->volume = *pa_sink_get_volume(sink, FALSE);
d->mute = pa_sink_get_mute(sink, FALSE);
@@ -1235,7 +1230,7 @@ pa_dbusiface_device
*pa_dbusiface_device_new_source(pa_dbusiface_core *core, pa_
d = pa_xnew0(pa_dbusiface_device, 1);
d->core = core;
d->source = pa_source_ref(source);
- d->type = DEVICE_TYPE_SOURCE;
+ d->type = PA_DEVICE_TYPE_SOURCE;
d->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH,
SOURCE_OBJECT_NAME, source->index);
d->volume = *pa_source_get_volume(source, FALSE);
d->mute = pa_source_get_mute(source, FALSE);
@@ -1277,7 +1272,7 @@ void pa_dbusiface_device_free(pa_dbusiface_device *d) {
pa_assert_se(pa_dbus_protocol_remove_interface(d->dbus_protocol, d->path,
device_interface_info.name) >= 0);
- if (d->type == DEVICE_TYPE_SINK) {
+ if (d->type == PA_DEVICE_TYPE_SINK) {
pa_assert_se(pa_dbus_protocol_remove_interface(d->dbus_protocol,
d->path, sink_interface_info.name) >= 0);
pa_sink_unref(d->sink);
@@ -1302,14 +1297,14 @@ const char
*pa_dbusiface_device_get_path(pa_dbusiface_device *d) {
pa_sink *pa_dbusiface_device_get_sink(pa_dbusiface_device *d) {
pa_assert(d);
- pa_assert(d->type == DEVICE_TYPE_SINK);
+ pa_assert(d->type == PA_DEVICE_TYPE_SINK);
return d->sink;
}
pa_source *pa_dbusiface_device_get_source(pa_dbusiface_device *d) {
pa_assert(d);
- pa_assert(d->type == DEVICE_TYPE_SOURCE);
+ pa_assert(d->type == PA_DEVICE_TYPE_SOURCE);
return d->source;
}
commit cc117be62b3bb3e6bad1857563b67c2716f1fc80
Author: Colin Guthrie <co...@mageia.org>
Date: Thu Aug 18 15:36:04 2011 +0100
def: Add a new enum to allow differntiation between sinks and sources.
This is for bits of code or API where the concepts and constructs are
extensibly the same for sinks and sources. To avoid duplication we can
simply define our structure/API and then use this enum to differentiate
the two.
diff --git a/src/pulse/def.h b/src/pulse/def.h
index 9d7cac8..386ea2b 100644
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -124,6 +124,17 @@ typedef enum pa_context_flags {
#define PA_CONTEXT_NOFAIL PA_CONTEXT_NOFAIL
/** \endcond */
+/** The type of device we are dealing with */
+typedef enum pa_device_type {
+ PA_DEVICE_TYPE_SINK, /**< Playback device */
+ PA_DEVICE_TYPE_SOURCE /**< Recording device */
+} pa_device_type_t;
+
+/** \cond fulldocs */
+#define PA_DEVICE_TYPE_SINK PA_DEVICE_TYPE_SINK
+#define PA_DEVICE_TYPE_SOURCE PA_DEVICE_TYPE_SOURCE
+/** \endcond */
+
/** The direction of a pa_stream object */
typedef enum pa_stream_direction {
PA_STREAM_NODIRECTION, /**< Invalid direction */
_______________________________________________
pulseaudio-commits mailing list
pulseaudio-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
