seq: event_cntr: add accesor APIs for queue data of event pointed by index

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/src/seq/alsaseq.map b/src/seq/alsaseq.map
index 408a9f25d84da25e07bd7963550c47150fe92759..f4277730989697e54c8bc2bc1adfb0e94d1f6aed 100644 (file)
--- a/src/seq/alsaseq.map
+++ b/src/seq/alsaseq.map
@@ -204,6 +204,8 @@ ALSA_GOBJECT_0_0_0 {
     "alsaseq_event_cntr_set_quadlet_data";
     "alsaseq_event_cntr_get_blob_data";
     "alsaseq_event_cntr_set_blob_data";
+    "alsaseq_event_cntr_get_queue_data";
+    "alsaseq_event_cntr_set_queue_data";
   local:
     *;
 };

diff --git a/src/seq/event-cntr.c b/src/seq/event-cntr.c
index 630dbb5872fa5ed98b82f0c85ae5c852dc622efd..748a48947b40d6ce564acea381f104004c995fcf 100644 (file)
--- a/src/seq/event-cntr.c
+++ b/src/seq/event-cntr.c
@@ -1196,3 +1196,65 @@ void alsaseq_event_cntr_set_blob_data(ALSASeqEventCntr *self, gsize index,
 
     ensure_variable_length_event(priv, ev, data, size, error);
 }
+
+/**
+ * alsaseq_event_cntr_get_queue_data:
+ * @self: A #ALSASeqEventCntr.
+ * @index: The index of event to set.
+ * @data: (out)(transfer none): The queue data of event.
+ * @error: A #GError.
+ *
+ * Get the queue data of event pointed by the index.
+ */
+void alsaseq_event_cntr_get_queue_data(ALSASeqEventCntr *self, gsize index,
+                            const ALSASeqEventDataQueue **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 ALSASeqEventDataQueue *)&ev->data.queue;
+}
+
+/**
+ * alsaseq_event_cntr_set_queue_data:
+ * @self: A #ALSASeqEventCntr.
+ * @index: The index of event to set.
+ * @data: The queue data of event.
+ * @error: A #GError.
+ *
+ * Copy the queue data to the event pointed by the index.
+ */
+void alsaseq_event_cntr_set_queue_data(ALSASeqEventCntr *self, gsize index,
+                            const ALSASeqEventDataQueue *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.queue = *(struct snd_seq_ev_queue_control *)data;
+}

diff --git a/src/seq/event-cntr.h b/src/seq/event-cntr.h
index 902f1e0c781725ec7ab7f39fe5ee391baae2d5ef..94d5a5e56335736e3c2b5430cc5da12aad756181 100644 (file)
--- a/src/seq/event-cntr.h
+++ b/src/seq/event-cntr.h
@@ -10,6 +10,7 @@
 #include <seq/addr.h>
 #include <seq/event-data-note.h>
 #include <seq/event-data-ctl.h>
+#include <seq/event-data-queue.h>
 
 G_BEGIN_DECLS
 
@@ -141,6 +142,11 @@ void alsaseq_event_cntr_set_blob_data(ALSASeqEventCntr *self, gsize index,
                                         const guint8 *data, gsize size,
                                         GError **error);
 
+void alsaseq_event_cntr_get_queue_data(ALSASeqEventCntr *self, gsize index,
+                            const ALSASeqEventDataQueue **data, GError **error);
+void alsaseq_event_cntr_set_queue_data(ALSASeqEventCntr *self, gsize index,
+                            const ALSASeqEventDataQueue *data, GError **error);
+
 G_END_DECLS
 
 #endif

diff --git a/tests/alsaseq-event-cntr b/tests/alsaseq-event-cntr
index 91abad04bafa9cdca70d5bd40271fb3e8c4fcc8e..3950089b13e31ab2bcf8e1a0c34f70ad42b74382 100644 (file)
--- a/tests/alsaseq-event-cntr
+++ b/tests/alsaseq-event-cntr
@@ -44,6 +44,8 @@ methods = (
     'set_quadlet_data',
     'get_blob_data',
     'set_blob_data',
+    'get_queue_data',
+    'set_queue_data',
 )
 signals = ()