From 797903d22dd61e270ffade19f8f55e6e37fa5b23 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 5 Jun 2022 12:39:24 +0900 Subject: [PATCH] timer: tick-event: rename from event-data-tick The name of EventDataTick is a bit redundant. Signed-off-by: Takashi Sakamoto --- src/timer/alsatimer.h | 2 +- src/timer/alsatimer.map | 8 +++---- src/timer/event-data-tick.h | 23 ------------------- src/timer/meson.build | 4 ++-- src/timer/{event-data-tick.c => tick-event.c} | 20 ++++++++-------- src/timer/tick-event.h | 23 +++++++++++++++++++ src/timer/user-instance.c | 4 ++-- src/timer/user-instance.h | 4 ++-- 8 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 src/timer/event-data-tick.h rename src/timer/{event-data-tick.c => tick-event.c} (60%) create mode 100644 src/timer/tick-event.h diff --git a/src/timer/alsatimer.h b/src/timer/alsatimer.h index 57238a2..ddee966 100644 --- a/src/timer/alsatimer.h +++ b/src/timer/alsatimer.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/src/timer/alsatimer.map b/src/timer/alsatimer.map index c998622..19fb740 100644 --- 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 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 - -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 9ea7f32..5b8de7c 100644 --- 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 0bfaa8f..69e019e 100644 --- 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 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 + +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 1a859c9..ba96c37 100644 --- 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 cbe5fe6..15fac4f 100644 --- 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: -- 2.47.3