From c9ba7e2692a1987529dc4276f4aa4d29186688d6 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 10 Jun 2020 07:13:52 +0900 Subject: [PATCH] seq: queue_timer_alsa: obsolete ALSASeqQueueTimerAlsa Signed-off-by: Takashi Sakamoto --- doc/reference/seq/alsaseq-docs.xml | 1 - doc/reference/seq/alsaseq.types | 1 - src/seq/alsaseq.map | 3 - src/seq/meson.build | 2 - src/seq/queue-timer-alsa.c | 112 ----------------------------- src/seq/queue-timer-alsa.h | 52 -------------- tests/alsaseq-queue-timer-alsa | 23 ------ tests/meson.build | 1 - 8 files changed, 195 deletions(-) delete mode 100644 src/seq/queue-timer-alsa.c delete mode 100644 src/seq/queue-timer-alsa.h delete mode 100644 tests/alsaseq-queue-timer-alsa diff --git a/doc/reference/seq/alsaseq-docs.xml b/doc/reference/seq/alsaseq-docs.xml index 64e308b..9202658 100644 --- a/doc/reference/seq/alsaseq-docs.xml +++ b/doc/reference/seq/alsaseq-docs.xml @@ -51,7 +51,6 @@ - diff --git a/doc/reference/seq/alsaseq.types b/doc/reference/seq/alsaseq.types index d8d91c1..bde0169 100644 --- a/doc/reference/seq/alsaseq.types +++ b/doc/reference/seq/alsaseq.types @@ -33,6 +33,5 @@ alsaseq_queue_info_get_type alsaseq_queue_status_get_type alsaseq_queue_tempo_get_type alsaseq_queue_timer_get_type -alsaseq_queue_timer_alsa_get_type alsaseq_queue_timer_data_alsa_get_type alsaseq_event_cntr_get_type diff --git a/src/seq/alsaseq.map b/src/seq/alsaseq.map index ea61071..131289b 100644 --- a/src/seq/alsaseq.map +++ b/src/seq/alsaseq.map @@ -149,9 +149,6 @@ ALSA_GOBJECT_0_0_0 { "alsaseq_queue_timer_get_alsa_data"; "alsaseq_queue_timer_set_alsa_data"; - "alsaseq_queue_timer_alsa_get_type"; - "alsaseq_queue_timer_alsa_new"; - "alsaseq_queue_timer_data_alsa_get_type"; "alsaseq_queue_timer_data_alsa_get_device_id"; "alsaseq_queue_timer_data_alsa_set_device_id"; diff --git a/src/seq/meson.build b/src/seq/meson.build index c01c906..29cfd6b 100644 --- a/src/seq/meson.build +++ b/src/seq/meson.build @@ -27,7 +27,6 @@ sources = files( 'queue-status.c', 'queue-tempo.c', 'queue-timer.c', - 'queue-timer-alsa.c', 'queue-timer-data-alsa.c', 'remove-filter.c', 'event-cntr.c', @@ -52,7 +51,6 @@ headers = files( 'queue-status.h', 'queue-tempo.h', 'queue-timer.h', - 'queue-timer-alsa.h', 'queue-timer-data-alsa.h', 'remove-filter.h', 'event-cntr.h', diff --git a/src/seq/queue-timer-alsa.c b/src/seq/queue-timer-alsa.c deleted file mode 100644 index 6583201..0000000 --- a/src/seq/queue-timer-alsa.c +++ /dev/null @@ -1,112 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-later -#include "queue-timer-alsa.h" -#include "privates.h" - -/** - * SECTION: queue-timer-alsa - * @Title: ALSASeqQueueTimerAlsa - * @Short_description: A GObject-derived object to represent timer instance for - * queue - * - * A #ALSASeqQueueTimerAlsa is a GObject-derived object to represent timer - * instance for queue. The instance belongs to ALSA timer functionality and is - * pointed by the identifier as property of the object. The object inherits - * properties and methods from #ALSASeqQueueTimer. - */ -G_DEFINE_TYPE(ALSASeqQueueTimerAlsa, alsaseq_queue_timer_alsa, ALSASEQ_TYPE_QUEUE_TIMER) - -enum seq_queue_timer_alsa_prop_type { - SEQ_QUEUE_TIMER_ALSA_PROP_TIMER_DEVICE_ID = 1, - SEQ_QUEUE_TIMER_ALSA_PROP_RESOLUTION, - SEQ_QUEUE_TIMER_ALSA_PROP_COUNT, -}; -static GParamSpec *seq_queue_timer_alsa_props[SEQ_QUEUE_TIMER_ALSA_PROP_COUNT] = { NULL, }; - -static void seq_queue_timer_alsa_set_property(GObject *obj, guint id, - const GValue *val, GParamSpec *spec) -{ - ALSASeqQueueTimer *parent = ALSASEQ_QUEUE_TIMER(obj); - struct snd_seq_queue_timer *timer; - - seq_queue_timer_refer_private(parent, &timer); - - switch (id) { - case SEQ_QUEUE_TIMER_ALSA_PROP_TIMER_DEVICE_ID: - { - ALSATimerDeviceId *device_id = g_value_get_boxed(val); - timer->u.alsa.id = *device_id; - break; - } - case SEQ_QUEUE_TIMER_ALSA_PROP_RESOLUTION: - timer->u.alsa.resolution = g_value_get_uint(val); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec); - break; - } -} - -static void seq_queue_timer_alsa_get_property(GObject *obj, guint id, - GValue *val, GParamSpec *spec) -{ - ALSASeqQueueTimer *parent = ALSASEQ_QUEUE_TIMER(obj); - struct snd_seq_queue_timer *timer; - - seq_queue_timer_refer_private(parent, &timer); - - switch (id) { - case SEQ_QUEUE_TIMER_ALSA_PROP_TIMER_DEVICE_ID: - { - g_value_set_static_boxed(val, &timer->u.alsa.id); - break; - } - case SEQ_QUEUE_TIMER_ALSA_PROP_RESOLUTION: - g_value_set_uint(val, timer->u.alsa.resolution); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec); - break; - } -} - -static void alsaseq_queue_timer_alsa_class_init(ALSASeqQueueTimerAlsaClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS(klass); - - gobject_class->set_property = seq_queue_timer_alsa_set_property; - gobject_class->get_property = seq_queue_timer_alsa_get_property; - - seq_queue_timer_alsa_props[SEQ_QUEUE_TIMER_ALSA_PROP_TIMER_DEVICE_ID] = - g_param_spec_boxed("timer-device-id", "timer-device-id", - "The device id for used timer.", - ALSATIMER_TYPE_DEVICE_ID, - G_PARAM_READWRITE); - - seq_queue_timer_alsa_props[SEQ_QUEUE_TIMER_ALSA_PROP_RESOLUTION] = - g_param_spec_uint("resolution", "resolution", - "The resolution of timer in Hz.", - 10, 6250, - 1000, - G_PARAM_READWRITE); - - g_object_class_install_properties(gobject_class, - SEQ_QUEUE_TIMER_ALSA_PROP_COUNT, - seq_queue_timer_alsa_props); -} - -static void alsaseq_queue_timer_alsa_init(ALSASeqQueueTimerAlsa *self) -{ - return; -} - -/** - * alsaseq_queue_timer_alsa_new: - * - * Allocate and return an instance of ALSASeqQueueTimerAlsa. - * - * Returns: A #ALSASeqQueueTimerAlsa. - */ -ALSASeqQueueTimerAlsa *alsaseq_queue_timer_alsa_new() -{ - return g_object_new(ALSASEQ_TYPE_QUEUE_TIMER_ALSA, NULL); -} diff --git a/src/seq/queue-timer-alsa.h b/src/seq/queue-timer-alsa.h deleted file mode 100644 index 6c879d4..0000000 --- a/src/seq/queue-timer-alsa.h +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-later -#ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER_ALSA__H__ -#define __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER_ALSA__H__ - -#include -#include - -#include - -G_BEGIN_DECLS - - -#define ALSASEQ_TYPE_QUEUE_TIMER_ALSA (alsaseq_queue_timer_alsa_get_type()) - -#define ALSASEQ_QUEUE_TIMER_ALSA(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - ALSASEQ_TYPE_QUEUE_TIMER_ALSA, \ - ALSASeqQueueTimerAlsa)) -#define ALSASEQ_IS_QUEUE_TIMER_ALSA(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ - ALSASEQ_TYPE_QUEUE_TIMER_ALSA)) - -#define ALSASEQ_QUEUE_TIMER_ALSA_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), \ - ALSASEQ_TYPE_QUEUE_TIMER_ALSA, \ - ALSASeqQueueTimerAlsaClass)) -#define ALSASEQ_IS_QUEUE_TIMER_ALSA_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), \ - ALSASEQ_TYPE_QUEUE_TIMER_ALSA)) -#define ALSASEQ_QUEUE_TIMER_ALSA_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS((obj), \ - ALSASEQ_TYPE_QUEUE_TIMER_ALSA, \ - ALSASeqQueueTimerAlsaClass)) - -typedef struct _ALSASeqQueueTimerAlsa ALSASeqQueueTimerAlsa; -typedef struct _ALSASeqQueueTimerAlsaClass ALSASeqQueueTimerAlsaClass; - -struct _ALSASeqQueueTimerAlsa { - ALSASeqQueueTimer parent_instance; -}; - -struct _ALSASeqQueueTimerAlsaClass { - ALSASeqQueueTimerClass parent_class; -}; - -GType alsaseq_queue_timer_alsa_get_type() G_GNUC_CONST; - -ALSASeqQueueTimerAlsa *alsaseq_queue_timer_alsa_new(); - -G_END_DECLS - -#endif diff --git a/tests/alsaseq-queue-timer-alsa b/tests/alsaseq-queue-timer-alsa deleted file mode 100644 index 245b7e7..0000000 --- a/tests/alsaseq-queue-timer-alsa +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python3 - -from sys import exit -from errno import ENXIO - -from helper import test - -import gi -gi.require_version('ALSASeq', '0.0') -from gi.repository import ALSASeq - -target = ALSASeq.QueueTimerAlsa() -props = ( - 'timer-device-id', - 'resolution', -) -methods = ( - 'new', -) -signals = () - -if not test(target, props, methods, signals): - exit(ENXIO) diff --git a/tests/meson.build b/tests/meson.build index 321ca71..c8b5e5b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -40,7 +40,6 @@ tests = { 'alsaseq-queue-status', 'alsaseq-queue-tempo', 'alsaseq-queue-timer', - 'alsaseq-queue-timer-alsa', 'alsaseq-event-cntr', ], 'hwdep': [ -- 2.47.3