From 4ac1b077f92e50f7e4bc4ade52a425a942aec3b3 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 16 Mar 2022 09:03:48 +0900 Subject: [PATCH] timer: add entry header to aggregate header inclusion It's convenient to add header to include all of headers in regard of documentation. Signed-off-by: Takashi Sakamoto --- src/seq/meson.build | 2 +- src/seq/queue-timer-data-alsa.h | 5 +---- src/timer/alsatimer-enum-types.h | 2 -- src/timer/alsatimer.h | 28 ++++++++++++++++++++++++++++ src/timer/device-id.c | 2 +- src/timer/device-id.h | 7 +------ src/timer/device-info.h | 5 +---- src/timer/device-params.h | 5 +---- src/timer/device-status.h | 3 +-- src/timer/event-data-tick.c | 1 - src/timer/event-data-tick.h | 5 +---- src/timer/event-data-tstamp.c | 1 - src/timer/event-data-tstamp.h | 7 +------ src/timer/event.c | 2 +- src/timer/event.h | 6 +----- src/timer/instance-info.h | 5 +---- src/timer/instance-params.c | 3 --- src/timer/instance-params.h | 5 +---- src/timer/instance-status.c | 4 +--- src/timer/instance-status.h | 3 +-- src/timer/meson.build | 8 +++++--- src/timer/privates.h | 9 +-------- src/timer/query.c | 2 -- src/timer/query.h | 10 +--------- src/timer/user-instance.c | 2 -- src/timer/user-instance.h | 9 +-------- 26 files changed, 51 insertions(+), 90 deletions(-) create mode 100644 src/timer/alsatimer.h diff --git a/src/seq/meson.build b/src/seq/meson.build index 52095b8..1846676 100644 --- a/src/seq/meson.build +++ b/src/seq/meson.build @@ -125,7 +125,7 @@ library = library(name, dependencies: dependencies, link_args : linker_flag, link_depends : mapfile_name, - include_directories: include_directories('..'), + include_directories: include_directories('..', '../timer'), ) install_headers(headers, diff --git a/src/seq/queue-timer-data-alsa.h b/src/seq/queue-timer-data-alsa.h index 7cd50ae..1f70fa5 100644 --- a/src/seq/queue-timer-data-alsa.h +++ b/src/seq/queue-timer-data-alsa.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER_DATA_ALSA__H__ #define __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER_DATA_ALSA__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/timer/alsatimer-enum-types.h b/src/timer/alsatimer-enum-types.h index b09599d..b527c97 100644 --- a/src/timer/alsatimer-enum-types.h +++ b/src/timer/alsatimer-enum-types.h @@ -1,8 +1,6 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_ENUM_TYPES__H__ #define __ALSA_GOBJECT_ALSATIMER_ENUM_TYPES__H__ -#include - /** * ALSATimerClass: * @ALSATIMER_CLASS_NONE: Invalid. diff --git a/src/timer/alsatimer.h b/src/timer/alsatimer.h new file mode 100644 index 0000000..740979e --- /dev/null +++ b/src/timer/alsatimer.h @@ -0,0 +1,28 @@ +#ifndef __ALSA_GOBJECT_ALSATIMER_H__ +#define __ALSA_GOBJECT_ALSATIMER_H__ + +#include +#include + +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#endif diff --git a/src/timer/device-id.c b/src/timer/device-id.c index 069379a..a1df998 100644 --- a/src/timer/device-id.c +++ b/src/timer/device-id.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "device-id.h" +#include "privates.h" /** * SECTION: device-id diff --git a/src/timer/device-id.h b/src/timer/device-id.h index 85f9f94..e4e1164 100644 --- a/src/timer/device-id.h +++ b/src/timer/device-id.h @@ -2,12 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_DEVICE_ID__H__ #define __ALSA_GOBJECT_ALSATIMER_DEVICE_ID__H__ -#include -#include - -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/timer/device-info.h b/src/timer/device-info.h index 19f3a6d..3e100bc 100644 --- a/src/timer/device-info.h +++ b/src/timer/device-info.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_DEVICE_INFO__H__ #define __ALSA_GOBJECT_ALSATIMER_DEVICE_INFO__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/timer/device-params.h b/src/timer/device-params.h index 47c57f8..ebc5c17 100644 --- a/src/timer/device-params.h +++ b/src/timer/device-params.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_DEVICE_PARAMS__H__ #define __ALSA_GOBJECT_ALSATIMER_DEVICE_PARAMS__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/timer/device-status.h b/src/timer/device-status.h index e608d3d..44c7b25 100644 --- a/src/timer/device-status.h +++ b/src/timer/device-status.h @@ -2,8 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_DEVICE_STATUS__H__ #define __ALSA_GOBJECT_ALSATIMER_DEVICE_STATUS__H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/src/timer/event-data-tick.c b/src/timer/event-data-tick.c index 4bff582..dc4efe0 100644 --- a/src/timer/event-data-tick.c +++ b/src/timer/event-data-tick.c @@ -1,5 +1,4 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "event-data-tick.h" #include "privates.h" /** diff --git a/src/timer/event-data-tick.h b/src/timer/event-data-tick.h index 6bd4a79..3e67b4d 100644 --- a/src/timer/event-data-tick.h +++ b/src/timer/event-data-tick.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TICK__H__ #define __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TICK__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/timer/event-data-tstamp.c b/src/timer/event-data-tstamp.c index 1eada5d..2994044 100644 --- a/src/timer/event-data-tstamp.c +++ b/src/timer/event-data-tstamp.c @@ -1,5 +1,4 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "event-data-tstamp.h" #include "privates.h" /** diff --git a/src/timer/event-data-tstamp.h b/src/timer/event-data-tstamp.h index 7de7d5d..2c1c6da 100644 --- a/src/timer/event-data-tstamp.h +++ b/src/timer/event-data-tstamp.h @@ -2,12 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TSTAMP__H__ #define __ALSA_GOBJECT_ALSATIMER_EVENT_DATA_TSTAMP__H__ -#include -#include - -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/timer/event.c b/src/timer/event.c index f77ec9c..cb36f94 100644 --- a/src/timer/event.c +++ b/src/timer/event.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "event.h" +#include "privates.h" /** * SECTION: event diff --git a/src/timer/event.h b/src/timer/event.h index de7c629..13546d6 100644 --- a/src/timer/event.h +++ b/src/timer/event.h @@ -2,11 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_EVENT__H__ #define __ALSA_GOBJECT_ALSATIMER_EVENT__H__ -#include -#include - -#include -#include +#include G_BEGIN_DECLS diff --git a/src/timer/instance-info.h b/src/timer/instance-info.h index f31082e..3907481 100644 --- a/src/timer/instance-info.h +++ b/src/timer/instance-info.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_INSTANCE_INFO__H__ #define __ALSA_GOBJECT_ALSATIMER_INSTANCE_INFO__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/timer/instance-params.c b/src/timer/instance-params.c index 1de2a8a..ddade1b 100644 --- a/src/timer/instance-params.c +++ b/src/timer/instance-params.c @@ -1,9 +1,6 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "instance-params.h" #include "privates.h" -#include - #include /** diff --git a/src/timer/instance-params.h b/src/timer/instance-params.h index 5c3da39..6c4ff4a 100644 --- a/src/timer/instance-params.h +++ b/src/timer/instance-params.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_INSTANCE_PARAMS__H__ #define __ALSA_GOBJECT_ALSATIMER_INSTANCE_PARAMS__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/timer/instance-status.c b/src/timer/instance-status.c index 3ab8d01..ca6f22b 100644 --- a/src/timer/instance-status.c +++ b/src/timer/instance-status.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "instance-status.h" - -#include +#include "privates.h" /** * SECTION: instance-status diff --git a/src/timer/instance-status.h b/src/timer/instance-status.h index 2521e9c..69d9254 100644 --- a/src/timer/instance-status.h +++ b/src/timer/instance-status.h @@ -2,8 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_INSTANCE_STATUS__H__ #define __ALSA_GOBJECT_ALSATIMER_INSTANCE_STATUS__H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/src/timer/meson.build b/src/timer/meson.build index 04fc2db..a476e5f 100644 --- a/src/timer/meson.build +++ b/src/timer/meson.build @@ -24,6 +24,7 @@ sources = files( ) headers = files( + 'alsatimer.h', 'query.h', 'device-id.h', 'device-info.h', @@ -73,7 +74,7 @@ if has_enumerations identifier_prefix: namespace, install_header: true, install_dir: join_paths(get_option('includedir'), inc_dir), - header_prefix: '#include <@0@-enum-types.h>'.format(join_paths(path, name)), + header_prefix: '#include ', ) else enums = [] @@ -105,7 +106,7 @@ library = library(name, dependencies: dependencies, link_args : linker_flag, link_depends : mapfile_name, - include_directories: include_directories('..'), + include_directories: include_directories('.'), ) install_headers(headers, @@ -116,7 +117,7 @@ install_headers(headers, pkg = import('pkgconfig') pkg.generate(library, description: 'GObject instrospection library for timer interface in asound.h', - subdirs: meson.project_name(), + subdirs: inc_dir, ) # Generate metadata for gobject introspection. @@ -132,6 +133,7 @@ alsatimer_gir = gnome.generate_gir(library, 'GLib-2.0', 'GObject-2.0', ], + header: 'alsatimer.h', install: true, ) diff --git a/src/timer/privates.h b/src/timer/privates.h index 161cece..f8b2248 100644 --- a/src/timer/privates.h +++ b/src/timer/privates.h @@ -2,14 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_PRIVATES__H__ #define __ALSA_GOBJECT_ALSATIMER_PRIVATES__H__ -#include "device-info.h" -#include "device-status.h" -#include "device-params.h" -#include "instance-info.h" -#include "instance-params.h" -#include "instance-status.h" - -#include +#include "alsatimer.h" G_BEGIN_DECLS diff --git a/src/timer/query.c b/src/timer/query.c index b1a7d49..d52df29 100644 --- a/src/timer/query.c +++ b/src/timer/query.c @@ -1,5 +1,4 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "query.h" #include "privates.h" #include @@ -12,7 +11,6 @@ #include #include -#include #include #include diff --git a/src/timer/query.h b/src/timer/query.h index 6e5e18d..6aa1758 100644 --- a/src/timer/query.h +++ b/src/timer/query.h @@ -2,15 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_QUERY__H__ #define __ALSA_GOBJECT_ALSATIMER_QUERY__H__ -#include -#include - -#include -#include -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/timer/user-instance.c b/src/timer/user-instance.c index e9ffa9f..8bccd6d 100644 --- a/src/timer/user-instance.c +++ b/src/timer/user-instance.c @@ -1,6 +1,4 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "user-instance.h" -#include "query.h" #include "privates.h" #include diff --git a/src/timer/user-instance.h b/src/timer/user-instance.h index 01d49e8..8b04f41 100644 --- a/src/timer/user-instance.h +++ b/src/timer/user-instance.h @@ -2,14 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSATIMER_USER_INSTANCE__H__ #define __ALSA_GOBJECT_ALSATIMER_USER_INSTANCE__H__ -#include -#include - -#include -#include -#include -#include -#include +#include G_BEGIN_DECLS -- 2.47.3