seq: enums: rename to tstamp mode

Some stuffs are named with 'timestamp', however 'tstamp' seems to be
preferable for consistency.

This commit renames them.

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

diff --git a/samples/seq b/samples/seq
index fefb0a0c0a7dcef0f09f695185db08ca19590e10..9d9e847a7ccbfeeec83a2b69f3bd862fa522f550 100755 (executable)
--- a/samples/seq
+++ b/samples/seq
@@ -69,7 +69,7 @@ queue_id = info.get_property('queue-id')
 ev_cntr = ALSASeq.EventCntr.new(2)
 
 ev_cntr.set_event_type(0, ALSASeq.EventType.START)
-ev_cntr.set_tstamp_mode(0, ALSASeq.EventTimestampMode.REAL)
+ev_cntr.set_tstamp_mode(0, ALSASeq.EventTstampMode.REAL)
 ev_cntr.set_time_mode(0, ALSASeq.EventTimeMode.REL)
 ev_cntr.set_priority_mode(0, ALSASeq.EventPriorityMode.NORMAL)
 ev_cntr.set_tag(0, 0)
@@ -82,7 +82,7 @@ data.set_queue_id(queue_id)
 ev_cntr.set_queue_data(0, data)
 
 ev_cntr.set_event_type(1, ALSASeq.EventType.CONTROLLER)
-ev_cntr.set_tstamp_mode(1, ALSASeq.EventTimestampMode.REAL)
+ev_cntr.set_tstamp_mode(1, ALSASeq.EventTstampMode.REAL)
 ev_cntr.set_time_mode(1, ALSASeq.EventTimeMode.REL)
 ev_cntr.set_priority_mode(1, ALSASeq.EventPriorityMode.NORMAL)
 ev_cntr.set_tag(1, 10)
@@ -113,7 +113,7 @@ def handle_event(client, ev_cntr):
         print('    tag:', tag)
         _, queue_id = ev_cntr.get_queue_id(i)
         print('    queue-id:', queue_id)
-        if tstamp_mode == ALSASeq.EventTimestampMode.TICK:
+        if tstamp_mode == ALSASeq.EventTstampMode.TICK:
             _, tick_time = ev_cntr.get_tick_time(i)
             print('    tick-time:', tick_time)
         else:

diff --git a/src/seq/alsaseq-enum-types.h b/src/seq/alsaseq-enum-types.h
index ff272f16783da8f7b869a08fb4dba0b1fcd1e3a1..d4ee35ac51ad24f4969343f27e772d4874b8d982 100644 (file)
--- a/src/seq/alsaseq-enum-types.h
+++ b/src/seq/alsaseq-enum-types.h
@@ -253,16 +253,16 @@ typedef enum {
 } ALSASeqEventType;
 
 /**
- * ALSASeqEventTimestampMode:
- * @ALSASEQ_EVENT_TIMESTAMP_MODE_TICK:      The timestamp includes tick count.
- * @ALSASEQ_EVENT_TIMESTAMP_MODE_REAL:      The timestamp includes real time.
+ * ALSASeqEventTstampMode:
+ * @ALSASEQ_EVENT_TSTAMP_MODE_TICK:      The time stamp includes tick count.
+ * @ALSASEQ_EVENT_TSTAMP_MODE_REAL:      The time stamp includes real time.
  *
- * A set of enumeration for the mode of timestamp.
+ * A set of enumeration for the mode of time stamp.
  */
 typedef enum {
-    ALSASEQ_EVENT_TIMESTAMP_MODE_TICK   = SNDRV_SEQ_TIME_STAMP_TICK,
-    ALSASEQ_EVENT_TIMESTAMP_MODE_REAL   = SNDRV_SEQ_TIME_STAMP_REAL,
-} ALSASeqEventTimestampMode;
+    ALSASEQ_EVENT_TSTAMP_MODE_TICK   = SNDRV_SEQ_TIME_STAMP_TICK,
+    ALSASEQ_EVENT_TSTAMP_MODE_REAL   = SNDRV_SEQ_TIME_STAMP_REAL,
+} ALSASeqEventTstampMode;
 
 /**
  * ALSASeqEventTimeMode:
@@ -315,15 +315,16 @@ typedef enum {
 /**
  * ALSASeqPortSubscribeFlag:
  * @ALSASEQ_PORT_SUBSCRIBE_FLAG_EXCLUSIVE:  The subscription can be changed by originator.
- * @ALSASEQ_PORT_SUBSCRIBE_FLAG_TIMESTAMP:  Any event for this subscription has timestamp.
- * @ALSASEQ_PORT_SUBSCRIBE_FLAG_TIME_REAL:  The timestamp on the event from the port has real time.
+ * @ALSASEQ_PORT_SUBSCRIBE_FLAG_TSTAMP:  Any event for this subscription has time stamp.
+ * @ALSASEQ_PORT_SUBSCRIBE_FLAG_TIME_REAL:  The time stamp on the event from the port has real time,
+ *                                          else tick time.
  *
  * A set of flags for subscription conditions.
  */
 typedef enum /*< flags >*/
 {
     ALSASEQ_PORT_SUBSCRIBE_FLAG_EXCLUSIVE = SNDRV_SEQ_PORT_SUBS_EXCLUSIVE,
-    ALSASEQ_PORT_SUBSCRIBE_FLAG_TIMESTAMP = SNDRV_SEQ_PORT_SUBS_TIMESTAMP,
+    ALSASEQ_PORT_SUBSCRIBE_FLAG_TSTAMP = SNDRV_SEQ_PORT_SUBS_TIMESTAMP,
     ALSASEQ_PORT_SUBSCRIBE_FLAG_TIME_REAL = SNDRV_SEQ_PORT_SUBS_TIME_REAL,
 } ALSASeqPortSubscribeFlag;
 

diff --git a/src/seq/alsaseq.map b/src/seq/alsaseq.map
index d86d22f2be8e40ea46619dded2087388b5f94e0c..ffb1efef38aab6c6b1612baec21632b9c391a210 100644 (file)
--- a/src/seq/alsaseq.map
+++ b/src/seq/alsaseq.map
@@ -8,7 +8,7 @@ ALSA_GOBJECT_0_0_0 {
     "alsaseq_port_cap_flag_get_type";
     "alsaseq_port_attr_flag_get_type";
     "alsaseq_event_type_get_type";
-    "alsaseq_event_timestamp_mode_get_type";
+    "alsaseq_event_tstamp_mode_get_type";
     "alsaseq_event_time_mode_get_type";
     "alsaseq_event_length_mode_get_type";
     "alsaseq_event_priority_mode_get_type";

diff --git a/src/seq/event-cntr.c b/src/seq/event-cntr.c
index 0e3327cf5d81d6b0fa7bd7ed2a1fa9a7436fb263..7cadc0a73c0a7fbc49ab5f2774d15f19241a604d 100644 (file)
--- a/src/seq/event-cntr.c
+++ b/src/seq/event-cntr.c
@@ -319,7 +319,7 @@ gboolean alsaseq_event_cntr_set_event_type(ALSASeqEventCntr *self, gsize index,
  * alsaseq_event_cntr_get_tstamp_mode:
  * @self: A [class@EventCntr].
  * @index: The index of event to set.
- * @mode: (out): The mode of timestamping, one of [enum@EventTimestampMode].
+ * @mode: (out): The mode of timestamping, one of [enum@EventTstampMode].
  * @error: A [struct@GLib.Error].
  *
  * Get the mode of timestamping for the event pointed by the index.
@@ -327,7 +327,7 @@ gboolean alsaseq_event_cntr_set_event_type(ALSASeqEventCntr *self, gsize index,
  * Returns: %TRUE when the overall operation finishes successfully, else %FALSE.
  */
 gboolean alsaseq_event_cntr_get_tstamp_mode(ALSASeqEventCntr *self, gsize index,
-                                            ALSASeqEventTimestampMode *mode, GError **error)
+                                            ALSASeqEventTstampMode *mode, GError **error)
 {
     ALSASeqEventCntrPrivate *priv;
     struct event_iterator iter;
@@ -344,7 +344,7 @@ gboolean alsaseq_event_cntr_get_tstamp_mode(ALSASeqEventCntr *self, gsize index,
     ev = event_iterator_find(&iter, index);
     g_return_val_if_fail(ev != NULL, FALSE);
 
-    *mode = (ALSASeqEventTimestampMode)(ev->flags & SNDRV_SEQ_TIME_STAMP_MASK);
+    *mode = (ALSASeqEventTstampMode)(ev->flags & SNDRV_SEQ_TIME_STAMP_MASK);
 
     return TRUE;
 }
@@ -353,7 +353,7 @@ gboolean alsaseq_event_cntr_get_tstamp_mode(ALSASeqEventCntr *self, gsize index,
  * alsaseq_event_cntr_set_tstamp_mode:
  * @self: A [class@EventCntr].
  * @index: The index of event to set.
- * @mode: The mode of timestamping, one of [enum@EventTimestampMode].
+ * @mode: The mode of timestamping, one of [enum@EventTstampMode].
  * @error: A [struct@GLib.Error].
  *
  * Set the mode of timestamping for the event pointed by the index.
@@ -361,7 +361,7 @@ gboolean alsaseq_event_cntr_get_tstamp_mode(ALSASeqEventCntr *self, gsize index,
  * Returns: %TRUE when the overall operation finishes successfully, else %FALSE.
  */
 gboolean alsaseq_event_cntr_set_tstamp_mode(ALSASeqEventCntr *self, gsize index,
-                                            ALSASeqEventTimestampMode mode, GError **error)
+                                            ALSASeqEventTstampMode mode, GError **error)
 {
     ALSASeqEventCntrPrivate *priv;
     struct event_iterator iter;
@@ -387,7 +387,7 @@ gboolean alsaseq_event_cntr_set_tstamp_mode(ALSASeqEventCntr *self, gsize index,
  * alsaseq_event_cntr_get_time_mode:
  * @self: A [class@EventCntr].
  * @index: The index of event to set.
- * @mode: (out): The mode of time, one of [enum@EventTimestampMode].
+ * @mode: (out): The mode of time, one of [enum@EventTstampMode].
  * @error: A [struct@GLib.Error].
  *
  * Get the mode of time for the event pointed by the index.
@@ -421,7 +421,7 @@ gboolean alsaseq_event_cntr_get_time_mode(ALSASeqEventCntr *self, gsize index,
  * alsaseq_event_cntr_set_time_mode:
  * @self: A [class@EventCntr].
  * @index: The index of event to set.
- * @mode: The mode of time, one of [enum@EventTimestampMode].
+ * @mode: The mode of time, one of [enum@EventTstampMode].
  * @error: A [struct@GLib.Error].
  *
  * Set the mode of time for the event pointed by the index.
@@ -455,7 +455,7 @@ gboolean alsaseq_event_cntr_set_time_mode(ALSASeqEventCntr *self, gsize index,
  * alsaseq_event_cntr_get_length_mode:
  * @self: A [class@EventCntr].
  * @index: The index of event to set.
- * @mode: (out): The mode of length, one of [enum@EventTimestampMode].
+ * @mode: (out): The mode of length, one of [enum@EventTstampMode].
  * @error: A [struct@GLib.Error].
  *
  * Get the mode of length for the event pointed by the index.
@@ -489,7 +489,7 @@ gboolean alsaseq_event_cntr_get_length_mode(ALSASeqEventCntr *self, gsize index,
  * alsaseq_event_cntr_get_priority_mode:
  * @self: A [class@EventCntr].
  * @index: The index of event to set.
- * @mode: (out): The mode of priority, one of [enum@EventTimestampMode].
+ * @mode: (out): The mode of priority, one of [enum@EventTstampMode].
  * @error: A [struct@GLib.Error].
  *
  * Get the mode of priority for the event pointed by the index.
@@ -523,7 +523,7 @@ gboolean alsaseq_event_cntr_get_priority_mode(ALSASeqEventCntr *self, gsize inde
  * alsaseq_event_cntr_set_priority_mode:
  * @self: A [class@EventCntr].
  * @index: The index of event to set.
- * @mode: The mode of priority, one of [enum@EventTimestampMode].
+ * @mode: The mode of priority, one of [enum@EventTstampMode].
  * @error: A [struct@GLib.Error].
  *
  * Set the mode of priority for the event pointed by the index.

diff --git a/src/seq/event-cntr.h b/src/seq/event-cntr.h
index ceb2e95763e10479d4cce991382827fff4f2615f..441f2313a3133a73acdc97dcc8ecb1cf36028d66 100644 (file)
--- a/src/seq/event-cntr.h
+++ b/src/seq/event-cntr.h
@@ -27,9 +27,9 @@ gboolean alsaseq_event_cntr_set_event_type(ALSASeqEventCntr *self, gsize index,
                                            ALSASeqEventType ev_type, GError **error);
 
 gboolean alsaseq_event_cntr_get_tstamp_mode(ALSASeqEventCntr *self, gsize index,
-                                            ALSASeqEventTimestampMode *mode, GError **error);
+                                            ALSASeqEventTstampMode *mode, GError **error);
 gboolean alsaseq_event_cntr_set_tstamp_mode(ALSASeqEventCntr *self, gsize index,
-                                            ALSASeqEventTimestampMode mode, GError **error);
+                                            ALSASeqEventTstampMode mode, GError **error);
 
 gboolean alsaseq_event_cntr_get_time_mode(ALSASeqEventCntr *self, gsize index,
                                           ALSASeqEventTimeMode *mode, GError **error);

diff --git a/src/seq/port-info.c b/src/seq/port-info.c
index 40d8f9e2894667d615ebd6e53263d80076e5549b..85b50457f0444660afa433b026d3958226144e81 100644 (file)
--- a/src/seq/port-info.c
+++ b/src/seq/port-info.c
@@ -131,9 +131,9 @@ static void seq_port_info_get_property(GObject *obj, guint id, GValue *val,
         break;
     case SEQ_PORT_INFO_PROP_TSTAMP_MODE:
         if (priv->info.flags & SNDRV_SEQ_PORT_FLG_TIME_REAL)
-            g_value_set_enum(val, ALSASEQ_EVENT_TIMESTAMP_MODE_REAL);
+            g_value_set_enum(val, ALSASEQ_EVENT_TSTAMP_MODE_REAL);
         else
-            g_value_set_enum(val, ALSASEQ_EVENT_TIMESTAMP_MODE_TICK);
+            g_value_set_enum(val, ALSASEQ_EVENT_TSTAMP_MODE_TICK);
         break;
     case SEQ_PORT_INFO_PROP_TIME_QUEUE:
         g_value_set_uchar(val, priv->info.time_queue);
@@ -225,8 +225,8 @@ static void alsaseq_port_info_class_init(ALSASeqPortInfoClass *klass)
         g_param_spec_enum("timestamp-mode", "timestamp-mode",
                           "The type of timestamp. This is effective when the "
                           "timestamp-overwrite property is enabled.",
-                          ALSASEQ_TYPE_EVENT_TIMESTAMP_MODE,
-                          ALSASEQ_EVENT_TIMESTAMP_MODE_TICK,
+                          ALSASEQ_TYPE_EVENT_TSTAMP_MODE,
+                          ALSASEQ_EVENT_TSTAMP_MODE_TICK,
                           G_PARAM_READWRITE);
 
     seq_port_info_props[SEQ_PORT_INFO_PROP_TIME_QUEUE] =

diff --git a/tests/alsaseq-enums b/tests/alsaseq-enums
index 88c0af0222311533dc26004640c1fc1f1d3e8962..7569394121ff1df14884b9843f7b76a13e989e9a 100644 (file)
--- a/tests/alsaseq-enums
+++ b/tests/alsaseq-enums
@@ -119,7 +119,7 @@ event_types = (
     'NONE',
 )
 
-event_timestamp_mode_types = (
+event_tstamp_mode_types = (
     'TICK',
     'REAL',
 )
@@ -146,7 +146,7 @@ specific_queue_id_types = (
 
 port_subscribe_flags = (
     'EXCLUSIVE',
-    'TIMESTAMP',
+    'TSTAMP',
     'TIME_REAL',
 )
 
@@ -179,7 +179,7 @@ types = {
     ALSASeq.PortCapFlag:        port_cap_flags,
     ALSASeq.PortAttrFlag:       port_attr_flags,
     ALSASeq.EventType:          event_types,
-    ALSASeq.EventTimestampMode: event_timestamp_mode_types,
+    ALSASeq.EventTstampMode:    event_tstamp_mode_types,
     ALSASeq.EventTimeMode:      event_time_mode_types,
     ALSASeq.EventLengthMode:    event_length_mode_types,
     ALSASeq.EventPriorityMode:  event_priority_mode_types,