timer: event_data: dismiss ALSATimerEventData

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 184304c5fa1edcdce4cdd094b7bd70c84f9a3be5..07ed742bbd82490209adee3fd799775722477a51 100644 (file)
--- a/doc/reference/timer/alsatimer-docs.xml
+++ b/doc/reference/timer/alsatimer-docs.xml
@@ -41,7 +41,6 @@
         <xi:include href="xml/instance-info.xml"/>
         <xi:include href="xml/instance-status.xml"/>
         <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-tstamp.xml"/>
     </chapter>

diff --git a/doc/reference/timer/alsatimer.types b/doc/reference/timer/alsatimer.types
index 424bf557a92831b74bf57c2721e78ff5002c4338..4b64a1d3624b8b1c9218b07eead2beb196209c98 100644 (file)
--- a/doc/reference/timer/alsatimer.types
+++ b/doc/reference/timer/alsatimer.types
@@ -13,6 +13,5 @@ alsatimer_user_instance_get_type
 alsatimer_instance_info_get_type
 alsatimer_instance_params_get_type
 alsatimer_instance_status_get_type
-alsatimer_event_data_get_type
 alsatimer_event_data_tick_get_type
 alsatimer_event_data_tstamp_get_type

diff --git a/src/timer/alsatimer.map b/src/timer/alsatimer.map
index 107010163bbe2e21987e5e6f9380d0ea29739d85..9fdaa8aa53f1355b85e0ca071281994fee76d155 100644 (file)
--- a/src/timer/alsatimer.map
+++ b/src/timer/alsatimer.map
@@ -53,8 +53,6 @@ ALSA_GOBJECT_0_0_0 {
     "alsatimer_instance_status_get_type";
     "alsatimer_instance_status_get_timestamp";
 
-    "alsatimer_event_data_get_type";
-
     "alsatimer_event_data_tick_get_type";
     "alsatimer_event_data_tick_get_resolution";
     "alsatimer_event_data_tick_get_ticks";

diff --git a/src/timer/event-data.c b/src/timer/event-data.c
deleted file mode 100644 (file)
index 3d6d9d0..0000000
--- a/src/timer/event-data.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-#include "event-data.h"
-
-/**
- * SECTION: event-data
- * @Title: ALSATimerEventData
- * @Short_description: A GObject-derived abstract object to represent common
- *                     data of event
- *
- * A #ALSATimerEventData is a GObject-derived abstract object to represent
- * common data of event.
- */
-struct _ALSATimerEventDataPrivate {
-    ALSATimerEventDataType type;
-};
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(ALSATimerEventData, alsatimer_event_data, G_TYPE_OBJECT)
-
-enum timer_event_data_prop_type{
-    TIMER_EVENT_DATA_PROP_EVENT_DATA_TYPE = 1,
-    TIMER_EVENT_DATA_PROP_COUNT,
-};
-static GParamSpec *timer_event_data_props[TIMER_EVENT_DATA_PROP_COUNT] = { NULL, };
-
-static void timer_event_data_set_property(GObject *obj, guint id,
-                                          const GValue *val, GParamSpec *spec)
-{
-    ALSATimerEventData *self = ALSATIMER_EVENT_DATA(obj);
-    ALSATimerEventDataPrivate *priv = alsatimer_event_data_get_instance_private(self);
-
-    switch (id) {
-    case TIMER_EVENT_DATA_PROP_EVENT_DATA_TYPE:
-       priv->type = g_value_get_enum(val);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec);
-        break;
-    }
-}
-
-static void timer_event_data_get_property(GObject *obj, guint id, GValue *val, GParamSpec *spec)
-{
-    ALSATimerEventData *self = ALSATIMER_EVENT_DATA(obj);
-    ALSATimerEventDataPrivate *priv = alsatimer_event_data_get_instance_private(self);
-
-    switch (id) {
-    case TIMER_EVENT_DATA_PROP_EVENT_DATA_TYPE:
-        g_value_set_enum(val, priv->type);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec);
-        break;
-    }
-}
-
-static void alsatimer_event_data_class_init(ALSATimerEventDataClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-
-    gobject_class->set_property = timer_event_data_set_property;
-    gobject_class->get_property = timer_event_data_get_property;
-
-    timer_event_data_props[TIMER_EVENT_DATA_PROP_EVENT_DATA_TYPE] =
-        g_param_spec_enum("type", "type",
-                          "The type of event_data, one of ALSATimerEventDataType.",
-                          ALSATIMER_TYPE_EVENT_DATA_TYPE,
-                          ALSATIMER_EVENT_DATA_TYPE_TICK,
-                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-    g_object_class_install_properties(gobject_class, TIMER_EVENT_DATA_PROP_COUNT,
-                                      timer_event_data_props);
-}
-
-static void alsatimer_event_data_init(ALSATimerEventData *self)
-{
-    return;
-}

diff --git a/src/timer/event-data.h b/src/timer/event-data.h
deleted file mode 100644 (file)
index ffda22c..0000000
--- a/src/timer/event-data.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-#ifndef __ALSA_GOBJECT_ALSATIMER_EVENT_DATA__H__
-#define __ALSA_GOBJECT_ALSATIMER_EVENT_DATA__H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <timer/alsatimer-enums.h>
-
-G_BEGIN_DECLS
-
-#define ALSATIMER_TYPE_EVENT_DATA   (alsatimer_event_data_get_type())
-
-#define ALSATIMER_EVENT_DATA(obj)                           \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                      \
-                                ALSATIMER_TYPE_EVENT_DATA,  \
-                                ALSATimerEventData))
-#define ALSATIMER_IS_EVENT_DATA(obj)                        \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                      \
-                                ALSATIMER_TYPE_EVENT_DATA))
-
-#define ALSATIMER_EVENT_DATA_CLASS(klass)                   \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                       \
-                             ALSATIMER_TYPE_EVENT_DATA,     \
-                             ALSATimerEventDataClass))
-#define ALSATIMER_IS_EVENT_DATA_CLASS(klass)                \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                       \
-                             ALSATIMER_TYPE_EVENT_DATA))
-#define ALSATIMER_EVENT_DATA_GET_CLASS(obj)                 \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                       \
-                               ALSATIMER_TYPE_EVENT_DATA,   \
-                               ALSATimerEventDataClass))
-
-typedef struct _ALSATimerEventData          ALSATimerEventData;
-typedef struct _ALSATimerEventDataClass     ALSATimerEventDataClass;
-typedef struct _ALSATimerEventDataPrivate   ALSATimerEventDataPrivate;
-
-struct _ALSATimerEventData {
-    GObject parent_instance;
-
-    ALSATimerEventDataPrivate *priv;
-};
-
-struct _ALSATimerEventDataClass {
-    GObjectClass parent_class;
-};
-
-GType alsatimer_event_data_get_type() G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif

diff --git a/src/timer/meson.build b/src/timer/meson.build
index bc037e2dbf0a948ad761970f276cc13da6b15257..62cfd08ada9d3ef8b22f7aff15cfad025ef3aa4a 100644 (file)
--- a/src/timer/meson.build
+++ b/src/timer/meson.build
@@ -18,7 +18,6 @@ sources = files(
   'instance-info.c',
   'instance-params.c',
   'instance-status.c',
-  'event-data.c',
   'event-data-tick.c',
   'event-data-tstamp.c',
   'event.c',
@@ -34,7 +33,6 @@ headers = files(
   'instance-info.h',
   'instance-params.h',
   'instance-status.h',
-  'event-data.h',
   'event-data-tick.h',
   'event-data-tstamp.h',
   'event.h',

diff --git a/tests/alsatimer-event-data b/tests/alsatimer-event-data
deleted file mode 100644 (file)
index 3856d7f..0000000
--- a/tests/alsatimer-event-data
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python3
-
-from sys import exit
-from errno import ENXIO
-
-from helper import test
-
-import gi
-gi.require_version('ALSATimer', '0.0')
-from gi.repository import ALSATimer
-
-target = ALSATimer.EventData
-props = (
-    'type',
-)
-methods = ()
-signals = ()
-
-if not test(target, props, methods, signals):
-    exit(ENXIO)

diff --git a/tests/meson.build b/tests/meson.build
index 3c3142e68d2cf1056c64b49c9e60187be8cde1a6..71135154a191b221df526daabf84f596e405fee9 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -24,7 +24,6 @@ tests = {
     'alsatimer-instance-info',
     'alsatimer-instance-params',
     'alsatimer-instance-status',
-    'alsatimer-event-data',
   ],
   'seq': [
     'alsaseq-enums',