From 3ed3362d93fcf5bd7e8d1dcc91fc4972d559331f Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 5 Jun 2022 12:39:24 +0900 Subject: [PATCH] timer: event: remove unused structure ALSATimer.Event is obsoleted and unused now. Signed-off-by: Takashi Sakamoto --- src/timer/alsatimer.h | 1 - src/timer/alsatimer.map | 5 ---- src/timer/event.c | 64 ----------------------------------------- src/timer/event.h | 28 ------------------ src/timer/meson.build | 2 -- 5 files changed, 100 deletions(-) delete mode 100644 src/timer/event.c delete mode 100644 src/timer/event.h diff --git a/src/timer/alsatimer.h b/src/timer/alsatimer.h index 33e3206..57238a2 100644 --- a/src/timer/alsatimer.h +++ b/src/timer/alsatimer.h @@ -12,7 +12,6 @@ #include #include -#include #include #include diff --git a/src/timer/alsatimer.map b/src/timer/alsatimer.map index 3db35c9..1681feb 100644 --- a/src/timer/alsatimer.map +++ b/src/timer/alsatimer.map @@ -45,11 +45,6 @@ ALSA_GOBJECT_0_0_0 { "alsatimer_event_data_tstamp_get_event"; "alsatimer_event_data_tstamp_get_tstamp"; "alsatimer_event_data_tstamp_get_val"; - - "alsatimer_event_get_type"; - "alsatimer_event_new"; - "alsatimer_event_get_tick_data"; - "alsatimer_event_get_tstamp_data"; local: *; }; diff --git a/src/timer/event.c b/src/timer/event.c deleted file mode 100644 index a187de1..0000000 --- a/src/timer/event.c +++ /dev/null @@ -1,64 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-later -#include "privates.h" - -/** - * ALSATimerEvent: - * A boxed object to represent event of timer. - * - * A [struct@Event] is a boxed object to represent event of timer. The instance of object uses - * single storage for two types of event data; [struct@EventDataTick] for and - * [struct@EventDataTstamp]. Applications can decide to use one of the two by passing one of - * [enum@EventType] to the call of [method@UserInstance.attach]. - */ -ALSATimerEvent *timer_event_copy(const ALSATimerEvent *self) -{ -#ifdef g_memdup2 - return g_memdup2(self, sizeof(*self)); -#else - // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to - // unsigned int however it's safe in the local case. - gpointer ptr = g_malloc(sizeof(*self)); - memcpy(ptr, self, sizeof(*self)); - return ptr; -#endif -} - -G_DEFINE_BOXED_TYPE(ALSATimerEvent, alsatimer_event, timer_event_copy, g_free) - -/** - * alsatimer_event_new: - * - * Allocate and return the instance of [struct@Event]. - * - * Returns: An instance of [struct@Event]. - */ -ALSATimerEvent *alsatimer_event_new() -{ - return g_malloc0(sizeof(ALSATimerEvent)); -} - -/** - * alsatimer_event_get_tick_data: - * @self: A [struct@Event]. - * @tick: (out)(transfer none): The instance of [struct@EventDataTick]. - * - * Refer to the instance of [struct@EventDataTick]. - */ -void alsatimer_event_get_tick_data(ALSATimerEvent *self, - const ALSATimerEventDataTick **tick) -{ - *tick = &self->tick; -} - -/** - * alsatimer_event_get_tstamp_data: - * @self: A [struct@Event]. - * @tstamp: (out)(transfer none): The instance of [struct@EventDataTstamp]. - * - * Refer to the instance of [struct@EventDataTstamp]. - */ -void alsatimer_event_get_tstamp_data(ALSATimerEvent *self, - const ALSATimerEventDataTstamp **tstamp) -{ - *tstamp = &self->tstamp; -} diff --git a/src/timer/event.h b/src/timer/event.h deleted file mode 100644 index efa9663..0000000 --- a/src/timer/event.h +++ /dev/null @@ -1,28 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-later -#ifndef __ALSA_GOBJECT_ALSATIMER_EVENT_H__ -#define __ALSA_GOBJECT_ALSATIMER_EVENT_H__ - -#include - -G_BEGIN_DECLS - -#define ALSATIMER_TYPE_EVENT (alsatimer_event_get_type()) - -typedef union { - ALSATimerEventDataTick tick; - ALSATimerEventDataTstamp tstamp; -} ALSATimerEvent; - -GType alsatimer_event_get_type() G_GNUC_CONST; - -ALSATimerEvent *alsatimer_event_new(); - -void alsatimer_event_get_tick_data(ALSATimerEvent *self, - const ALSATimerEventDataTick **tick); - -void alsatimer_event_get_tstamp_data(ALSATimerEvent *self, - const ALSATimerEventDataTstamp **tstamp); - -G_END_DECLS - -#endif diff --git a/src/timer/meson.build b/src/timer/meson.build index 2c3a1fb..9ea7f32 100644 --- a/src/timer/meson.build +++ b/src/timer/meson.build @@ -20,7 +20,6 @@ sources = files( 'instance-status.c', 'event-data-tick.c', 'event-data-tstamp.c', - 'event.c', ) headers = files( @@ -35,7 +34,6 @@ headers = files( 'instance-status.h', 'event-data-tick.h', 'event-data-tstamp.h', - 'event.h', ) privates = files( -- 2.47.3