seq: event_cntr: add accesor APIs for control 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 4c852efb27d936bf6715e90d62b130d372bd1121..3cdb9afaa4fa7ecec9ad109a4a9f899fd004b375 100644 (file)
--- a/src/seq/alsaseq.map
+++ b/src/seq/alsaseq.map
@@ -196,6 +196,8 @@ ALSA_GOBJECT_0_0_0 {
     "alsaseq_event_cntr_set_src";
     "alsaseq_event_cntr_get_note_data";
     "alsaseq_event_cntr_set_note_data";
+    "alsaseq_event_cntr_get_ctl_data";
+    "alsaseq_event_cntr_set_ctl_data";
   local:
     *;
 };

diff --git a/src/seq/event-cntr.c b/src/seq/event-cntr.c
index d1a848d73f66d837def5a52a835dbf33fa58b387..7ccedb19ba8006f8c931f53e765c781b8ec356d2 100644 (file)
--- a/src/seq/event-cntr.c
+++ b/src/seq/event-cntr.c
@@ -881,3 +881,65 @@ void alsaseq_event_cntr_set_note_data(ALSASeqEventCntr *self, gsize index,
 
     ev->data.note = *(struct snd_seq_ev_note *)data;
 }
+
+/**
+ * alsaseq_event_cntr_get_ctl_data:
+ * @self: A #ALSASeqEventCntr.
+ * @index: The index of event to set.
+ * @data: (out)(transfer none): The control data of event.
+ * @error: A #GError.
+ *
+ * Get the control data of event pointed by the index.
+ */
+void alsaseq_event_cntr_get_ctl_data(ALSASeqEventCntr *self, gsize index,
+                            const ALSASeqEventDataCtl **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 ALSASeqEventDataCtl *)&ev->data.control;
+}
+
+/**
+ * alsaseq_event_cntr_set_ctl_data:
+ * @self: A #ALSASeqEventCntr.
+ * @index: The index of event to set.
+ * @data: The control data of event.
+ * @error: A #GError.
+ *
+ * Copy the control data to the event pointed by the index.
+ */
+void alsaseq_event_cntr_set_ctl_data(ALSASeqEventCntr *self, gsize index,
+                            const ALSASeqEventDataCtl *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.control = *(struct snd_seq_ev_ctrl *)data;
+}

diff --git a/src/seq/event-cntr.h b/src/seq/event-cntr.h
index d485955b1f950aafa6a1d24d61866eebcf503ddf..e8e3fb3a03de51fb5a2f0441b58b99c417f8a320 100644 (file)
--- a/src/seq/event-cntr.h
+++ b/src/seq/event-cntr.h
@@ -9,6 +9,7 @@
 #include <seq/tstamp.h>
 #include <seq/addr.h>
 #include <seq/event-data-note.h>
+#include <seq/event-data-ctl.h>
 
 G_BEGIN_DECLS
 
@@ -118,6 +119,11 @@ void alsaseq_event_cntr_get_note_data(ALSASeqEventCntr *self, gsize index,
 void alsaseq_event_cntr_set_note_data(ALSASeqEventCntr *self, gsize index,
                             const ALSASeqEventDataNote *data, GError **error);
 
+void alsaseq_event_cntr_get_ctl_data(ALSASeqEventCntr *self, gsize index,
+                            const ALSASeqEventDataCtl **data, GError **error);
+void alsaseq_event_cntr_set_ctl_data(ALSASeqEventCntr *self, gsize index,
+                            const ALSASeqEventDataCtl *data, GError **error);
+
 G_END_DECLS
 
 #endif

diff --git a/tests/alsaseq-event-cntr b/tests/alsaseq-event-cntr
index 2a7b791e1185e6b84a260739e144dd85c7cc9018..9732a79f8509b8b533a517993db63ae7700afde9 100644 (file)
--- a/tests/alsaseq-event-cntr
+++ b/tests/alsaseq-event-cntr
@@ -36,6 +36,8 @@ methods = (
     'set_src',
     'get_note_data',
     'set_note_data',
+    'get_ctl_data',
+    'set_ctl_data',
 )
 signals = ()