seq: event_fixed: add a property for queue data of event

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

diff --git a/src/seq/event-fixed.c b/src/seq/event-fixed.c
index e1ff5917f1aecfafd01c88fd8f0a041fc09129c4..2adab80cb4cd8d94874f167fb5913c245d5da93c 100644 (file)
--- a/src/seq/event-fixed.c
+++ b/src/seq/event-fixed.c
@@ -10,6 +10,7 @@ enum seq_event_fixed_prop_type {
     SEQ_EVENT_FIXED_PROP_RESULT_DATA = 1,
     SEQ_EVENT_FIXED_PROP_NOTE_DATA,
     SEQ_EVENT_FIXED_PROP_CTL_DATA,
+    SEQ_EVENT_FIXED_PROP_QUEUE_DATA,
     SEQ_EVENT_FIXED_PROP_COUNT,
 };
 static GParamSpec *seq_event_fixed_props[SEQ_EVENT_FIXED_PROP_COUNT] = { NULL, };
@@ -43,6 +44,13 @@ static void seq_event_fixed_set_property(GObject *obj, guint id,
             ev->data.control = *data;
         break;
     }
+    case SEQ_EVENT_FIXED_PROP_QUEUE_DATA:
+    {
+        ALSASeqEventDataQueue *data = g_value_get_boxed(val);
+        if (data != NULL)
+            ev->data.queue = *data;
+        break;
+    }
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec);
         break;
@@ -63,6 +71,12 @@ static void seq_event_fixed_get_property(GObject *obj, guint id, GValue *val,
     case SEQ_EVENT_FIXED_PROP_NOTE_DATA:
         g_value_set_static_boxed(val, &ev->data.note);
         break;
+    case SEQ_EVENT_FIXED_PROP_CTL_DATA:
+        g_value_set_static_boxed(val, &ev->data.control);
+        break;
+    case SEQ_EVENT_FIXED_PROP_QUEUE_DATA:
+        g_value_set_static_boxed(val, &ev->data.queue);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec);
         break;
@@ -97,6 +111,13 @@ static void alsaseq_event_fixed_class_init(ALSASeqEventFixedClass *klass)
                            ALSASEQ_TYPE_EVENT_DATA_CTL,
                            G_PARAM_READWRITE);
 
+    seq_event_fixed_props[SEQ_EVENT_FIXED_PROP_QUEUE_DATA] =
+        g_param_spec_boxed("queue-data", "queue-data",
+                           "The data of queue type. This shares the same "
+                           "storage between the other properties",
+                           ALSASEQ_TYPE_EVENT_DATA_QUEUE,
+                           G_PARAM_READWRITE);
+
     g_object_class_install_properties(gobject_class,
                                       SEQ_EVENT_FIXED_PROP_COUNT,
                                       seq_event_fixed_props);

diff --git a/src/seq/event-fixed.h b/src/seq/event-fixed.h
index 6e33f00a03a6b9e7d202e63152dce98199d46915..d0d7c51bc9cd3fd9cf22167a4293a3f6864d053e 100644 (file)
--- a/src/seq/event-fixed.h
+++ b/src/seq/event-fixed.h
@@ -9,6 +9,7 @@
 #include <seq/event-data-result.h>
 #include <seq/event-data-note.h>
 #include <seq/event-data-ctl.h>
+#include <seq/event-data-queue.h>
 
 G_BEGIN_DECLS
 

diff --git a/tests/alsaseq-event-fixed b/tests/alsaseq-event-fixed
index dd276678b86a4d18b59efb339d54264d3603749a..c0cd9084e67b680d685b70d8abbd03764bbcd8b8 100644 (file)
--- a/tests/alsaseq-event-fixed
+++ b/tests/alsaseq-event-fixed
@@ -14,6 +14,7 @@ props = (
     'result-data',
     'note-data',
     'ctl-data',
+    'queue-data',
 )
 methods = (
     'new',