timer: event_data_tstamp: rename to ALSASeqEventDataTstamp

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

diff --git a/doc/reference/timer/alsatimer-docs.xml b/doc/reference/timer/alsatimer-docs.xml
index 11e605f294e815cbf06de9ee360f6f9b71ff2b53..184304c5fa1edcdce4cdd094b7bd70c84f9a3be5 100644 (file)
--- a/doc/reference/timer/alsatimer-docs.xml
+++ b/doc/reference/timer/alsatimer-docs.xml
@@ -43,7 +43,7 @@
         <xi:include href="xml/instance-params.xml"/>
         <xi:include href="xml/event-data.xml"/>
         <xi:include href="xml/event-data-tick.xml"/>
-        <xi:include href="xml/event-data-timestamp.xml"/>
+        <xi:include href="xml/event-data-tstamp.xml"/>
     </chapter>
 
     <index id="index-all">

diff --git a/doc/reference/timer/alsatimer.types b/doc/reference/timer/alsatimer.types
index 867014b66ac622e02a18c0a8ad7ff412b6ee992b..424bf557a92831b74bf57c2721e78ff5002c4338 100644 (file)
--- a/doc/reference/timer/alsatimer.types
+++ b/doc/reference/timer/alsatimer.types
@@ -15,4 +15,4 @@ alsatimer_instance_params_get_type
 alsatimer_instance_status_get_type
 alsatimer_event_data_get_type
 alsatimer_event_data_tick_get_type
-alsatimer_event_data_timestamp_get_type
+alsatimer_event_data_tstamp_get_type

diff --git a/src/timer/alsatimer.map b/src/timer/alsatimer.map
index c584257eb4116e525a28ed6987063f78786e4fa9..653b7e15d419616078cb849d03dc9609692d3fe9 100644 (file)
--- a/src/timer/alsatimer.map
+++ b/src/timer/alsatimer.map
@@ -59,7 +59,7 @@ ALSA_GOBJECT_0_0_0 {
     "alsatimer_event_data_tick_get_resolution";
     "alsatimer_event_data_tick_get_ticks";
 
-    "alsatimer_event_data_timestamp_get_type";
+    "alsatimer_event_data_tstamp_get_type";
 
     "alsatimer_event_get_type";
   local:

diff --git a/src/timer/event-data-timestamp.c b/src/timer/event-data-timestamp.c
deleted file mode 100644 (file)
index 78f7162..0000000
--- a/src/timer/event-data-timestamp.c
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-#include "event-data-timestamp.h"
-#include "privates.h"
-
-/**
- * SECTION: event-data-timestamp
- * @Title: ALSATimerEventDataTimestamp
- * @Short_description: A boxed object to represent event of timer with
- *                     timestamp
- *
- * A #ALSATimerEventDataTimestamp is a boxed object to represent event of timer
- * with timestamp.
- *
- * The object wraps 'struct snd_timer_tread' in UAPI of Linux sound subsystem.
- */
-ALSATimerEventDataTimestamp *timer_event_data_timestamp_copy(const ALSATimerEventDataTimestamp *self)
-{
-    return g_memdup(self, sizeof(*self));
-}
-
-G_DEFINE_BOXED_TYPE(ALSATimerEventDataTimestamp, alsatimer_event_data_timestamp, timer_event_data_timestamp_copy, g_free)

diff --git a/src/timer/event-data-timestamp.h b/src/timer/event-data-timestamp.h
deleted file mode 100644 (file)
index 01a0ef8..0000000
--- a/src/timer/event-data-timestamp.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-#ifndef __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TIMESTAMP__H__
-#define __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TIMESTAMP__H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <sound/asound.h>
-
-G_BEGIN_DECLS
-
-#define ALSATIMER_TYPE_EVENT_DATA_TIMESTAMP (alsatimer_event_data_timestamp_get_type())
-
-typedef struct snd_timer_tread ALSATimerEventDataTimestamp;
-
-GType alsatimer_event_data_timestamp_get_type() G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif

diff --git a/src/timer/event-data-tstamp.c b/src/timer/event-data-tstamp.c
new file mode 100644 (file)
index 0000000..b8e791e
--- /dev/null
+++ b/src/timer/event-data-tstamp.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+#include "event-data-tstamp.h"
+#include "privates.h"
+
+/**
+ * SECTION: event-data-tstamp
+ * @Title: ALSATimerEventDataTstamp
+ * @Short_description: A boxed object to represent event of timer with
+ *                     tstamp
+ *
+ * A #ALSATimerEventDataTstamp is a boxed object to represent event of timer
+ * with tstamp.
+ *
+ * The object wraps 'struct snd_timer_tread' in UAPI of Linux sound subsystem.
+ */
+ALSATimerEventDataTstamp *timer_event_data_tstamp_copy(const ALSATimerEventDataTstamp *self)
+{
+    return g_memdup(self, sizeof(*self));
+}
+
+G_DEFINE_BOXED_TYPE(ALSATimerEventDataTstamp, alsatimer_event_data_tstamp, timer_event_data_tstamp_copy, g_free)

diff --git a/src/timer/event-data-tstamp.h b/src/timer/event-data-tstamp.h
new file mode 100644 (file)
index 0000000..06a1997
--- /dev/null
+++ b/src/timer/event-data-tstamp.h
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+#ifndef __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TSTAMP__H__
+#define __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TSTAMP__H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <sound/asound.h>
+
+G_BEGIN_DECLS
+
+#define ALSATIMER_TYPE_EVENT_DATA_TSTAMP    (alsatimer_event_data_tstamp_get_type())
+
+typedef struct snd_timer_tread ALSATimerEventDataTstamp;
+
+GType alsatimer_event_data_tstamp_get_type() G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif

diff --git a/src/timer/event.h b/src/timer/event.h
index 6277d3c01cb2c5f53ee6251268b22f2c781b2124..a1922ac48844ebe26120423a08ab41998c3fa0fd 100644 (file)
--- a/src/timer/event.h
+++ b/src/timer/event.h
@@ -6,7 +6,7 @@
 #include <glib-object.h>
 
 #include <timer/event-data-tick.h>
-#include <timer/event-data-timestamp.h>
+#include <timer/event-data-tstamp.h>
 
 G_BEGIN_DECLS
 
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
 
 typedef union {
     ALSATimerEventDataTick tick;
-    ALSATimerEventDataTimestamp timestamp;
+    ALSATimerEventDataTstamp tstamp;
 } ALSATimerEvent;
 
 GType alsatimer_event_get_type() G_GNUC_CONST;

diff --git a/src/timer/meson.build b/src/timer/meson.build
index 0ffa9eb5359bcce7fca7b64da57e9562f84763aa..bc037e2dbf0a948ad761970f276cc13da6b15257 100644 (file)
--- a/src/timer/meson.build
+++ b/src/timer/meson.build
@@ -20,7 +20,7 @@ sources = files(
   'instance-status.c',
   'event-data.c',
   'event-data-tick.c',
-  'event-data-timestamp.c',
+  'event-data-tstamp.c',
   'event.c',
 )
 
@@ -36,7 +36,7 @@ headers = files(
   'instance-status.h',
   'event-data.h',
   'event-data-tick.h',
-  'event-data-timestamp.h',
+  'event-data-tstamp.h',
   'event.h',
 )