timer: tick-event: rename from event-data-tick

The name of EventDataTick is a bit redundant.

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

diff --git a/src/timer/alsatimer.h b/src/timer/alsatimer.h
index 57238a299bf344f095fb7a57ae2afa2680d6de93..ddee9663700e5cc9b611549329597185f47abcd1 100644 (file)
--- a/src/timer/alsatimer.h
+++ b/src/timer/alsatimer.h
@@ -10,7 +10,7 @@
 #include <alsatimer-enum-types.h>
 #include <alsatimer-enums.h>
 
-#include <event-data-tick.h>
+#include <tick-event.h>
 #include <event-data-tstamp.h>
 
 #include <device-id.h>

diff --git a/src/timer/alsatimer.map b/src/timer/alsatimer.map
index c998622160d66baa71c79afd513d0cdf3bc7437e..19fb740bbc8f445816a631201c152b476a624d2a 100644 (file)
--- a/src/timer/alsatimer.map
+++ b/src/timer/alsatimer.map
@@ -35,10 +35,6 @@ ALSA_GOBJECT_0_0_0 {
     "alsatimer_instance_status_new";
     "alsatimer_instance_status_get_tstamp";
 
-    "alsatimer_event_data_tick_get_type";
-    "alsatimer_event_data_tick_get_resolution";
-    "alsatimer_event_data_tick_get_ticks";
-
     "alsatimer_event_data_tstamp_get_type";
     "alsatimer_event_data_tstamp_get_event";
     "alsatimer_event_data_tstamp_get_tstamp";
@@ -77,4 +73,8 @@ ALSA_GOBJECT_0_3_0 {
 
     "alsatimer_tstamp_event_type_get_type";
     "alsatimer_event_type_get_type";
+
+    "alsatimer_tick_event_get_type";
+    "alsatimer_tick_event_get_resolution";
+    "alsatimer_tick_event_get_ticks";
 } ALSA_GOBJECT_0_2_0;

diff --git a/src/timer/event-data-tick.h b/src/timer/event-data-tick.h
deleted file mode 100644 (file)
index 52d7b22..0000000
--- a/src/timer/event-data-tick.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-#ifndef __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TICK_H__
-#define __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TICK_H__
-
-#include <alsatimer.h>
-
-G_BEGIN_DECLS
-
-#define ALSATIMER_TYPE_EVENT_DATA_TICK   (alsatimer_event_data_tick_get_type())
-
-typedef struct snd_timer_read ALSATimerEventDataTick;
-
-GType alsatimer_event_data_tick_get_type() G_GNUC_CONST;
-
-void alsatimer_event_data_tick_get_resolution(const ALSATimerEventDataTick *self,
-                                              guint *resolution);
-
-void alsatimer_event_data_tick_get_ticks(const ALSATimerEventDataTick *self,
-                                         guint *ticks);
-
-G_END_DECLS
-
-#endif

diff --git a/src/timer/meson.build b/src/timer/meson.build
index 9ea7f321f0547937cc9017a76e5a5b12a6c095b6..5b8de7c3d197723ed5302464d2fcff2bc912b42e 100644 (file)
--- a/src/timer/meson.build
+++ b/src/timer/meson.build
@@ -18,7 +18,7 @@ sources = files(
   'instance-info.c',
   'instance-params.c',
   'instance-status.c',
-  'event-data-tick.c',
+  'tick-event.c',
   'event-data-tstamp.c',
 )
 
@@ -32,7 +32,7 @@ headers = files(
   'instance-info.h',
   'instance-params.h',
   'instance-status.h',
-  'event-data-tick.h',
+  'tick-event.h',
   'event-data-tstamp.h',
 )
 

diff --git a/src/timer/event-data-tick.c b/src/timer/tick-event.c
similarity index 60%
rename from src/timer/event-data-tick.c
rename to src/timer/tick-event.c
index 0bfaa8f4a9d9438987c91992fae4a14d779a0977..69e019e2a57e182255e6f943c446b31b6b4c16eb 100644 (file)
--- a/src/timer/event-data-tick.c
+++ b/src/timer/tick-event.c
@@ -2,14 +2,14 @@
 #include "privates.h"
 
 /**
- * ALSATimerEventDataTick:
+ * ALSATimerTickEvent:
  * A boxed object to represent event of timer with tick count.
  *
- * A [struct@EventDataTick] is a boxed object to represent event of timer with tick count.
+ * A [struct@TickEvent] is a boxed object to represent event of timer with tick count.
  *
  * The object wraps `struct snd_timer_read` in UAPI of Linux sound subsystem.
  */
-ALSATimerEventDataTick *timer_event_data_tick_copy(const ALSATimerEventDataTick *self)
+ALSATimerTickEvent *timer_tick_event_copy(const ALSATimerTickEvent *self)
 {
 #ifdef g_memdup2
     return g_memdup2(self, sizeof(*self));
@@ -22,29 +22,29 @@ ALSATimerEventDataTick *timer_event_data_tick_copy(const ALSATimerEventDataTick
 #endif
 }
 
-G_DEFINE_BOXED_TYPE(ALSATimerEventDataTick, alsatimer_event_data_tick, timer_event_data_tick_copy, g_free)
+G_DEFINE_BOXED_TYPE(ALSATimerTickEvent, alsatimer_tick_event, timer_tick_event_copy, g_free)
 
 /**
- * alsatimer_event_data_tick_get_resolution:
- * @self: A [struct@EventDataTick].
+ * alsatimer_tick_event_get_resolution:
+ * @self: A [struct@TickEvent].
  * @resolution: (out): The resolution of tick event.
  *
  * Get the resolution of tick event.
  */
-void alsatimer_event_data_tick_get_resolution(const ALSATimerEventDataTick *self,
+void alsatimer_tick_event_get_resolution(const ALSATimerTickEvent *self,
                                               guint *resolution)
 {
     *resolution = self->resolution;
 }
 
 /**
- * alsatimer_event_data_tick_get_ticks:
- * @self: A [struct@EventDataTick].
+ * alsatimer_tick_event_get_ticks:
+ * @self: A [struct@TickEvent].
  * @ticks: (out): The tick count since the last event.
  *
  * Get the tick count since the last event.
  */
-void alsatimer_event_data_tick_get_ticks(const ALSATimerEventDataTick *self,
+void alsatimer_tick_event_get_ticks(const ALSATimerTickEvent *self,
                                          guint *ticks)
 {
     *ticks = self->ticks;

diff --git a/src/timer/tick-event.h b/src/timer/tick-event.h
new file mode 100644 (file)
index 0000000..c1090ce
--- /dev/null
+++ b/src/timer/tick-event.h
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+#ifndef __ALSA_GOBJECT_ALSATIMER_TICK_EVENT_H__
+#define __ALSA_GOBJECT_ALSATIMER_TICK_EVENT_H__
+
+#include <alsatimer.h>
+
+G_BEGIN_DECLS
+
+#define ALSATIMER_TYPE_TICK_EVENT   (alsatimer_tick_event_get_type())
+
+typedef struct snd_timer_read ALSATimerTickEvent;
+
+GType alsatimer_tick_event_get_type() G_GNUC_CONST;
+
+void alsatimer_tick_event_get_resolution(const ALSATimerTickEvent *self,
+                                              guint *resolution);
+
+void alsatimer_tick_event_get_ticks(const ALSATimerTickEvent *self,
+                                         guint *ticks);
+
+G_END_DECLS
+
+#endif

diff --git a/src/timer/user-instance.c b/src/timer/user-instance.c
index 1a859c931c2589a980f1561edf35b85e8cd7dbb6..ba96c371741001e1de3109522c4acbb6e14c0ea9 100644 (file)
--- a/src/timer/user-instance.c
+++ b/src/timer/user-instance.c
@@ -87,7 +87,7 @@ static void alsatimer_user_instance_class_init(ALSATimerUserInstanceClass *klass
     /**
      * ALSATimerUserInstance::handle-tick-event:
      * @self: A [class@UserInstance].
-     * @event: (transfer none): The instance of [struct@EventDataTick].
+     * @event: (transfer none): The instance of [struct@TickEvent].
      *
      * Emitted when tick event occurs.
      */
@@ -98,7 +98,7 @@ static void alsatimer_user_instance_class_init(ALSATimerUserInstanceClass *klass
                      G_STRUCT_OFFSET(ALSATimerUserInstanceClass, handle_tick_event),
                      NULL, NULL,
                      g_cclosure_marshal_VOID__BOXED,
-                     G_TYPE_NONE, 1, ALSATIMER_TYPE_EVENT_DATA_TICK);
+                     G_TYPE_NONE, 1, ALSATIMER_TYPE_TICK_EVENT);
 
     /**
      * ALSATimerUserInstance::handle-tstamp-event:

diff --git a/src/timer/user-instance.h b/src/timer/user-instance.h
index cbe5fe65180b513d7f382de76bbef182714e90e1..15fac4f34bbafe2540460dcad7cbbe7aae8335a0 100644 (file)
--- a/src/timer/user-instance.h
+++ b/src/timer/user-instance.h
@@ -21,11 +21,11 @@ struct _ALSATimerUserInstanceClass {
     /**
      * ALSATimerUserInstanceClass::handle_tick_event:
      * @self: A [class@UserInstance].
-     * @event: (transfer none): An object derived from [struct@EventDataTick].
+     * @event: (transfer none): An object derived from [struct@TickEvent].
      *
      * Class closure for the [signal@UserInstance::handle-tick-event] signal.
      */
-    void (*handle_tick_event)(ALSATimerUserInstance *self, const ALSATimerEventDataTick *event);
+    void (*handle_tick_event)(ALSATimerUserInstance *self, const ALSATimerTickEvent *event);
 
     /**
      * ALSATimerUserInstanceClass::handle_tstamp_event: