From 12173e8804d24276577902abe7324c638247b503 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Mon, 8 Jun 2020 23:10:10 +0900 Subject: [PATCH] seq: event_cntr: add accesor APIs for connect data of event pointed by index Signed-off-by: Takashi Sakamoto --- src/seq/alsaseq.map | 2 ++ src/seq/event-cntr.c | 62 ++++++++++++++++++++++++++++++++++++++++ src/seq/event-cntr.h | 5 ++++ tests/alsaseq-event-cntr | 2 ++ 4 files changed, 71 insertions(+) diff --git a/src/seq/alsaseq.map b/src/seq/alsaseq.map index 7d23f89..fffc00d 100644 --- a/src/seq/alsaseq.map +++ b/src/seq/alsaseq.map @@ -210,6 +210,8 @@ ALSA_GOBJECT_0_0_0 { "alsaseq_event_cntr_set_tstamp_data"; "alsaseq_event_cntr_get_addr_data"; "alsaseq_event_cntr_set_addr_data"; + "alsaseq_event_cntr_get_connect_data"; + "alsaseq_event_cntr_set_connect_data"; local: *; }; diff --git a/src/seq/event-cntr.c b/src/seq/event-cntr.c index d9fe2e3..8ad82ac 100644 --- a/src/seq/event-cntr.c +++ b/src/seq/event-cntr.c @@ -1382,3 +1382,65 @@ void alsaseq_event_cntr_set_addr_data(ALSASeqEventCntr *self, gsize index, ev->data.addr = *(struct snd_seq_addr *)data; } + +/** + * alsaseq_event_cntr_get_connect_data: + * @self: A #ALSASeqEventCntr. + * @index: The index of event to set. + * @data: (out)(transfer none): The connect data of event. + * @error: A #GError. + * + * Get the connect data of event pointed by the index. + */ +void alsaseq_event_cntr_get_connect_data(ALSASeqEventCntr *self, gsize index, + const ALSASeqEventDataConnect **data, GError **error) +{ + ALSASeqEventCntrPrivate *priv; + struct event_iterator iter; + struct snd_seq_event *ev; + + g_return_if_fail(ALSASEQ_IS_EVENT_CNTR(self)); + priv = alsaseq_event_cntr_get_instance_private(self); + + event_iterator_init(&iter, priv->buf, priv->length, priv->allocated); + ev = event_iterator_find(&iter, index); + if (ev == NULL) { + generate_error(error, EINVAL); + return; + } + + *data = (const ALSASeqEventDataConnect *)&ev->data.connect; +} + +/** + * alsaseq_event_cntr_set_connect_data: + * @self: A #ALSASeqEventCntr. + * @index: The index of event to set. + * @data: The connect data of event. + * @error: A #GError. + * + * Copy the connect data to the event pointed by the index. + */ +void alsaseq_event_cntr_set_connect_data(ALSASeqEventCntr *self, gsize index, + const ALSASeqEventDataConnect *data, GError **error) +{ + ALSASeqEventCntrPrivate *priv; + struct event_iterator iter; + struct snd_seq_event *ev; + + g_return_if_fail(ALSASEQ_IS_EVENT_CNTR(self)); + priv = alsaseq_event_cntr_get_instance_private(self); + + event_iterator_init(&iter, priv->buf, priv->length, priv->allocated); + ev = event_iterator_find(&iter, index); + if (ev == NULL) { + generate_error(error, EINVAL); + return; + } + + ensure_fixed_length_event(priv, ev, error); + if (*error != NULL) + return; + + ev->data.connect = *(struct snd_seq_connect *)data; +} diff --git a/src/seq/event-cntr.h b/src/seq/event-cntr.h index defe12d..3a527a3 100644 --- a/src/seq/event-cntr.h +++ b/src/seq/event-cntr.h @@ -158,6 +158,11 @@ void alsaseq_event_cntr_get_addr_data(ALSASeqEventCntr *self, gsize index, void alsaseq_event_cntr_set_addr_data(ALSASeqEventCntr *self, gsize index, const ALSASeqAddr *data, GError **error); +void alsaseq_event_cntr_get_connect_data(ALSASeqEventCntr *self, gsize index, + const ALSASeqEventDataConnect **data, GError **error); +void alsaseq_event_cntr_set_connect_data(ALSASeqEventCntr *self, gsize index, + const ALSASeqEventDataConnect *data, GError **error); + G_END_DECLS #endif diff --git a/tests/alsaseq-event-cntr b/tests/alsaseq-event-cntr index 93c48fc..4a31340 100644 --- a/tests/alsaseq-event-cntr +++ b/tests/alsaseq-event-cntr @@ -48,6 +48,8 @@ methods = ( 'set_queue_data', 'get_tstamp_data', 'set_tstamp_data', + 'get_connect_data', + 'set_connect_data', ) signals = () -- 2.47.3