seq: user_client: schedule events in ALSASeqEventCntr instead of ALSASeqEvent

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

diff --git a/src/seq/event-cntr.c b/src/seq/event-cntr.c
index 43db2d75e390202fb4ac3a44002229bf1058319d..a917e39df9b31e239c4679daf9156ba86740823e 100644 (file)
--- a/src/seq/event-cntr.c
+++ b/src/seq/event-cntr.c
@@ -1555,3 +1555,20 @@ void seq_event_cntr_set_buf(ALSASeqEventCntr *self, guint8 *buf,
     priv->buf = buf;
     priv->length = length;
 }
+
+void seq_event_cntr_get_buf(ALSASeqEventCntr *self, gsize count,
+                              const guint8 **buf, gsize *length)
+{
+    ALSASeqEventCntrPrivate *priv =
+                                alsaseq_event_cntr_get_instance_private(self);
+    struct event_iterator iter;
+
+    event_iterator_init(&iter, priv->buf, priv->length, priv->allocated);
+    if (event_iterator_find(&iter, count - 1) != NULL) {
+        *buf = priv->buf;
+        *length = iter.offset;
+    } else {
+        *buf = NULL;
+        *length = 0;
+    }
+}

diff --git a/src/seq/privates.h b/src/seq/privates.h
index f07ef34157eaf4120f88cb465a988d46bef55fb7..5129374fe215846fca384a7c0a26ac756761de88 100644 (file)
--- a/src/seq/privates.h
+++ b/src/seq/privates.h
@@ -61,6 +61,9 @@ void seq_queue_timer_refer_private(ALSASeqQueueTimer *self,
 void seq_event_cntr_set_buf(ALSASeqEventCntr *self, guint8 *buf,
                               gsize length);
 
+void seq_event_cntr_get_buf(ALSASeqEventCntr *self, gsize count,
+                              const guint8 **buf, gsize *length);
+
 G_END_DECLS
 
 #endif

diff --git a/src/seq/user-client.c b/src/seq/user-client.c
index d536dd5d2d088547cd4eb04644f8bd77cc62ab1d..67af1e75600be25221a3ed68f25de468ec191019 100644 (file)
--- a/src/seq/user-client.c
+++ b/src/seq/user-client.c
@@ -362,60 +362,41 @@ void alsaseq_user_client_get_pool(ALSASeqUserClient *self,
 /**
  * alsaseq_user_client_schedule_event:
  * @self: A #ALSASeqUserClient.
- * @event: An instance of #ALSASeqEvent to schedule.
+ * @ev_cntr: An instance of #ALSASeqEventCntr pointing to events.
+ * @count: The number of events in the ev_cntr to write.
  * @error: A #GError.
  *
  * Deliver the event immediately, or schedule it into memory pool of the client.
  */
 void alsaseq_user_client_schedule_event(ALSASeqUserClient *self,
-                                        ALSASeqEvent *event, GError **error)
+                                        ALSASeqEventCntr *ev_cntr,
+                                        gsize count, GError **error)
 {
     ALSASeqUserClientPrivate *priv;
-    struct snd_seq_event *ev;
+    gsize total;
+    const guint8 *buf;
+    gsize length;
     ssize_t len;
-    guint8 *ptr;
 
     g_return_if_fail(ALSASEQ_IS_USER_CLIENT(self));
-    g_return_if_fail(ALSASEQ_IS_EVENT(event));
+    g_return_if_fail(ALSASEQ_IS_EVENT_CNTR(ev_cntr));
     priv = alsaseq_user_client_get_instance_private(self);
-    seq_event_refer_private(event, &ev);
 
-    switch (ev->flags & SNDRV_SEQ_EVENT_LENGTH_MASK) {
-    case SNDRV_SEQ_EVENT_LENGTH_FIXED:
-        ptr = NULL;
-        len = sizeof(*ev);
-        break;
-    case SNDRV_SEQ_EVENT_LENGTH_VARIABLE:
-        if (ev->data.ext.len == 0 || ev->data.ext.ptr == NULL) {
-            generate_error(error, EINVAL);
-            return;
-        }
-
-        len = sizeof(*ev) + ev->data.ext.len;
-        ptr = g_malloc0(len);
-        if (ptr == NULL) {
-            generate_error(error, ENOMEM);
-            return;
-        }
-
-        memcpy(ptr, ev, sizeof(*ev));
-        memcpy(ptr + sizeof(*ev), ev->data.ext.ptr, ev->data.ext.len);
-
-        ev = (struct snd_seq_event *)ptr;
-        break;
-    case SNDRV_SEQ_EVENT_LENGTH_VARUSR:
-        // Unsupported since it handles raw pointer which is difficult to
-        // be exposed by interfaces capable for g-i.
-    default:
-        break;
+    alsaseq_event_cntr_count_events(ev_cntr, &total);
+    if (count > total) {
+        generate_error(error, ENOBUFS);
+        return;
     }
 
-    len = write(priv->fd, ev, len);
+    seq_event_cntr_get_buf(ev_cntr, count, &buf, &length);
+    if (buf == NULL || length == 0) {
+        generate_error(error, ENODATA);
+        return;
+    }
+
+    len = write(priv->fd, buf, length);
     if (len < 0)
         generate_error(error, errno);
-
-    if (ptr != NULL)
-        g_free(ptr);
 }
 
 static gboolean seq_user_client_check_src(GSource *gsrc)

diff --git a/src/seq/user-client.h b/src/seq/user-client.h
index 8f342159d80758074a7312961fc335c9fdd2aa0b..82f69e9eee5b204006e5fcf67613faa720590f14 100644 (file)
--- a/src/seq/user-client.h
+++ b/src/seq/user-client.h
@@ -105,7 +105,8 @@ void alsaseq_user_client_get_pool(ALSASeqUserClient *self,
                                   GError **error);
 
 void alsaseq_user_client_schedule_event(ALSASeqUserClient *self,
-                                        ALSASeqEvent *event, GError **error);
+                                        ALSASeqEventCntr *ev_cntr,
+                                        gsize count, GError **error);
 
 void alsaseq_user_client_create_source(ALSASeqUserClient *self,
                                        GSource **gsrc, GError **error);