From f1e63b509e5f2880062899464eefca703f63cc32 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 16 Mar 2022 09:03:48 +0900 Subject: [PATCH] seq: 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/addr.c | 2 +- src/seq/addr.h | 5 +---- src/seq/alsaseq-enum-types.h | 2 -- src/seq/alsaseq.h | 38 +++++++++++++++++++++++++++++++++ src/seq/client-info.h | 5 +---- src/seq/client-pool.h | 3 +-- src/seq/event-cntr.h | 12 +---------- src/seq/event-data-connect.c | 2 +- src/seq/event-data-connect.h | 7 +----- src/seq/event-data-ctl.c | 2 +- src/seq/event-data-ctl.h | 7 +----- src/seq/event-data-note.c | 2 +- src/seq/event-data-note.h | 5 +---- src/seq/event-data-queue.c | 2 +- src/seq/event-data-queue.h | 7 +----- src/seq/event-data-result.c | 2 +- src/seq/event-data-result.h | 7 +----- src/seq/meson.build | 8 ++++--- src/seq/port-info.h | 6 +----- src/seq/privates.h | 18 +--------------- src/seq/query.c | 1 - src/seq/query.h | 11 +--------- src/seq/queue-info.h | 3 +-- src/seq/queue-status.h | 3 +-- src/seq/queue-tempo.h | 3 +-- src/seq/queue-timer-data-alsa.c | 2 +- src/seq/queue-timer-data-alsa.h | 1 + src/seq/queue-timer.c | 4 +--- src/seq/queue-timer.h | 6 +----- src/seq/remove-filter.c | 1 - src/seq/remove-filter.h | 8 +------ src/seq/subscribe-data.h | 6 +----- src/seq/system-info.h | 3 +-- src/seq/tstamp.c | 2 +- src/seq/tstamp.h | 5 +---- src/seq/user-client.c | 2 -- src/seq/user-client.h | 13 +---------- 37 files changed, 74 insertions(+), 142 deletions(-) create mode 100644 src/seq/alsaseq.h diff --git a/src/seq/addr.c b/src/seq/addr.c index f169b55..b437d38 100644 --- a/src/seq/addr.c +++ b/src/seq/addr.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "addr.h" +#include "privates.h" /** * SECTION: addr diff --git a/src/seq/addr.h b/src/seq/addr.h index 14628e1..e899c01 100644 --- a/src/seq/addr.h +++ b/src/seq/addr.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_ADDR__H__ #define __ALSA_GOBJECT_ALSASEQ_ADDR__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/seq/alsaseq-enum-types.h b/src/seq/alsaseq-enum-types.h index b7f3f91..b1d7c12 100644 --- a/src/seq/alsaseq-enum-types.h +++ b/src/seq/alsaseq-enum-types.h @@ -2,8 +2,6 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_ENUM_TYPES__H__ #define __ALSA_GOBJECT_ALSASEQ_ENUM_TYPES__H__ -#include - /** * ALSASeqSpecificAddress: * @ALSASEQ_SPECIFIC_ADDRESS_UNKNOWN: The address for unknown client/port/queue. diff --git a/src/seq/alsaseq.h b/src/seq/alsaseq.h new file mode 100644 index 0000000..a51dc59 --- /dev/null +++ b/src/seq/alsaseq.h @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +#ifndef __ALSA_GOBJECT_ALSASEQ__H__ +#define __ALSA_GOBJECT_ALSASEQ__H__ + +#include +#include + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#endif diff --git a/src/seq/client-info.h b/src/seq/client-info.h index 4fc1281..b8e7b84 100644 --- a/src/seq/client-info.h +++ b/src/seq/client-info.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_CLIENT_INFO__H__ #define __ALSA_GOBJECT_ALSASEQ_CLIENT_INFO__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/seq/client-pool.h b/src/seq/client-pool.h index 0048732..1050e00 100644 --- a/src/seq/client-pool.h +++ b/src/seq/client-pool.h @@ -2,8 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_CLIENT_POOL__H__ #define __ALSA_GOBJECT_ALSASEQ_CLIENT_POOL__H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/event-cntr.h b/src/seq/event-cntr.h index a8eb764..cc2ec2a 100644 --- a/src/seq/event-cntr.h +++ b/src/seq/event-cntr.h @@ -2,17 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_CNTR__H__ #define __ALSA_GOBJECT_ALSASEQ_EVENT_CNTR__H__ -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/event-data-connect.c b/src/seq/event-data-connect.c index 5901c18..1e095b5 100644 --- a/src/seq/event-data-connect.c +++ b/src/seq/event-data-connect.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "event-data-connect.h" +#include "privates.h" /** * SECTION: event-data-connect diff --git a/src/seq/event-data-connect.h b/src/seq/event-data-connect.h index f40c6a3..04f6a73 100644 --- a/src/seq/event-data-connect.h +++ b/src/seq/event-data-connect.h @@ -2,12 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_CONNECT__H__ #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_CONNECT__H__ -#include -#include - -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/seq/event-data-ctl.c b/src/seq/event-data-ctl.c index 63ea2c6..70ab351 100644 --- a/src/seq/event-data-ctl.c +++ b/src/seq/event-data-ctl.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "event-data-ctl.h" +#include "privates.h" /** * SECTION: event-data-ctl diff --git a/src/seq/event-data-ctl.h b/src/seq/event-data-ctl.h index 84a033b..3936884 100644 --- a/src/seq/event-data-ctl.h +++ b/src/seq/event-data-ctl.h @@ -2,12 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_CTL__H__ #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_CTL__H__ -#include -#include - -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/seq/event-data-note.c b/src/seq/event-data-note.c index da906e0..cd5b46b 100644 --- a/src/seq/event-data-note.c +++ b/src/seq/event-data-note.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "event-data-note.h" +#include "privates.h" /** * SECTION: event-data-note diff --git a/src/seq/event-data-note.h b/src/seq/event-data-note.h index 9f36ac7..2a7cb91 100644 --- a/src/seq/event-data-note.h +++ b/src/seq/event-data-note.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_NOTE__H__ #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_NOTE__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/seq/event-data-queue.c b/src/seq/event-data-queue.c index b115d17..2a92b76 100644 --- a/src/seq/event-data-queue.c +++ b/src/seq/event-data-queue.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "event-data-queue.h" +#include "privates.h" /** * SECTION: event-data-queue diff --git a/src/seq/event-data-queue.h b/src/seq/event-data-queue.h index 9d4b65e..42ec66a 100644 --- a/src/seq/event-data-queue.h +++ b/src/seq/event-data-queue.h @@ -2,12 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_QUEUE_H__ #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_QUEUE_H__ -#include -#include - -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/seq/event-data-result.c b/src/seq/event-data-result.c index 0339da9..c0741cf 100644 --- a/src/seq/event-data-result.c +++ b/src/seq/event-data-result.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "event-data-result.h" +#include "privates.h" /** * SECTION: event-data-result diff --git a/src/seq/event-data-result.h b/src/seq/event-data-result.h index 5dd3a23..0510610 100644 --- a/src/seq/event-data-result.h +++ b/src/seq/event-data-result.h @@ -2,12 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_RESULT__H__ #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_RESULT__H__ -#include -#include - -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/seq/meson.build b/src/seq/meson.build index 1846676..052f8ec 100644 --- a/src/seq/meson.build +++ b/src/seq/meson.build @@ -33,6 +33,7 @@ sources = files( ) headers = files( + 'alsaseq.h', 'query.h', 'system-info.h', 'client-info.h', @@ -92,7 +93,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 enum @@ -125,7 +126,7 @@ library = library(name, dependencies: dependencies, link_args : linker_flag, link_depends : mapfile_name, - include_directories: include_directories('..', '../timer'), + include_directories: include_directories('.', '../timer'), ) install_headers(headers, @@ -136,7 +137,7 @@ install_headers(headers, pkg = import('pkgconfig') pkg.generate(library, description: 'GObject instrospection library for sequencer interface in asequencer.h', - subdirs: meson.project_name(), + subdirs: inc_dir, ) # Generate metadata for gobject introspection. @@ -153,6 +154,7 @@ gnome.generate_gir(library, 'GObject-2.0', alsatimer_gir[0], ], + header: 'alsaseq.h', install: true, ) diff --git a/src/seq/port-info.h b/src/seq/port-info.h index dac749f..dc7764f 100644 --- a/src/seq/port-info.h +++ b/src/seq/port-info.h @@ -2,11 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_PORT_INFO__H__ #define __ALSA_GOBJECT_ALSASEQ_PORT_INFO__H__ -#include -#include - -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/privates.h b/src/seq/privates.h index 61ec8b0..1ae834f 100644 --- a/src/seq/privates.h +++ b/src/seq/privates.h @@ -2,23 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_PRIVATES__H__ #define __ALSA_GOBJECT_ALSASEQ_PRIVATES__H__ -#include - -#include -#include - -#include "system-info.h" -#include "client-info.h" -#include "port-info.h" -#include "client-pool.h" -#include "subscribe-data.h" -#include "queue-info.h" -#include "queue-status.h" -#include "queue-tempo.h" -#include "queue-timer.h" -#include "event-cntr.h" - -#include +#include "alsaseq.h" G_BEGIN_DECLS diff --git a/src/seq/query.c b/src/seq/query.c index 682002c..da95689 100644 --- a/src/seq/query.c +++ b/src/seq/query.c @@ -1,5 +1,4 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "query.h" #include "privates.h" #include diff --git a/src/seq/query.h b/src/seq/query.h index a5b6f78..4924d5e 100644 --- a/src/seq/query.h +++ b/src/seq/query.h @@ -2,16 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_QUERY__H__ #define __ALSA_GOBJECT_ALSASEQ_QUERY__H__ -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/queue-info.h b/src/seq/queue-info.h index f7ad958..5f119bb 100644 --- a/src/seq/queue-info.h +++ b/src/seq/queue-info.h @@ -2,8 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_INFO__H__ #define __ALSA_GOBJECT_ALSASEQ_QUEUE_INFO__H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/queue-status.h b/src/seq/queue-status.h index 5301f36..0a7fd31 100644 --- a/src/seq/queue-status.h +++ b/src/seq/queue-status.h @@ -2,8 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_STATUS__H__ #define __ALSA_GOBJECT_ALSASEQ_QUEUE_STATUS__H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/queue-tempo.h b/src/seq/queue-tempo.h index 158e241..6472200 100644 --- a/src/seq/queue-tempo.h +++ b/src/seq/queue-tempo.h @@ -2,8 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_TEMPO__H__ #define __ALSA_GOBJECT_ALSASEQ_QUEUE_TEMPO__H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/queue-timer-data-alsa.c b/src/seq/queue-timer-data-alsa.c index 54f0326..d4b82b6 100644 --- a/src/seq/queue-timer-data-alsa.c +++ b/src/seq/queue-timer-data-alsa.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "queue-timer-data-alsa.h" +#include "privates.h" /** * SECTION: queue-timer-data-alsa diff --git a/src/seq/queue-timer-data-alsa.h b/src/seq/queue-timer-data-alsa.h index 1f70fa5..207ee3a 100644 --- a/src/seq/queue-timer-data-alsa.h +++ b/src/seq/queue-timer-data-alsa.h @@ -2,6 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER_DATA_ALSA__H__ #define __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER_DATA_ALSA__H__ +#include #include G_BEGIN_DECLS diff --git a/src/seq/queue-timer.c b/src/seq/queue-timer.c index b8ef1ea..2429bf9 100644 --- a/src/seq/queue-timer.c +++ b/src/seq/queue-timer.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "queue-timer.h" - -#include +#include "privates.h" /** * SECTION: queue-timer diff --git a/src/seq/queue-timer.h b/src/seq/queue-timer.h index 8caf035..99c3eda 100644 --- a/src/seq/queue-timer.h +++ b/src/seq/queue-timer.h @@ -2,11 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER__H__ #define __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER__H__ -#include -#include - -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/remove-filter.c b/src/seq/remove-filter.c index e0576de..2d45326 100644 --- a/src/seq/remove-filter.c +++ b/src/seq/remove-filter.c @@ -1,5 +1,4 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "remove-filter.h" #include "privates.h" #include diff --git a/src/seq/remove-filter.h b/src/seq/remove-filter.h index 65a578f..b9461d3 100644 --- a/src/seq/remove-filter.h +++ b/src/seq/remove-filter.h @@ -2,13 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_REMOVE_FILTER__H__ #define __ALSA_GOBJECT_ALSASEQ_REMOVE_FILTER__H__ -#include -#include - -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/seq/subscribe-data.h b/src/seq/subscribe-data.h index 00e60e4..a0065c8 100644 --- a/src/seq/subscribe-data.h +++ b/src/seq/subscribe-data.h @@ -2,11 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_SUBSCRIBE_DATA__H__ #define __ALSA_GOBJECT_ALSASEQ_SUBSCRIBE_DATA__H__ -#include -#include - -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/system-info.h b/src/seq/system-info.h index ac190e5..4219f53 100644 --- a/src/seq/system-info.h +++ b/src/seq/system-info.h @@ -2,8 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_SYSTEM_INFO__H__ #define __ALSA_GOBJECT_ALSASEQ_SYSTEM_INFO__H__ -#include -#include +#include G_BEGIN_DECLS diff --git a/src/seq/tstamp.c b/src/seq/tstamp.c index 8ab632a..09a1412 100644 --- a/src/seq/tstamp.c +++ b/src/seq/tstamp.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "tstamp.h" +#include "privates.h" /** * SECTION: tstamp diff --git a/src/seq/tstamp.h b/src/seq/tstamp.h index df6b013..c8e4eb8 100644 --- a/src/seq/tstamp.h +++ b/src/seq/tstamp.h @@ -2,10 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_TSTAMP__H__ #define __ALSA_GOBJECT_ALSASEQ_TSTAMP__H__ -#include -#include - -#include +#include G_BEGIN_DECLS diff --git a/src/seq/user-client.c b/src/seq/user-client.c index 1eb6cfc..1e0cf86 100644 --- a/src/seq/user-client.c +++ b/src/seq/user-client.c @@ -1,6 +1,4 @@ // SPDX-License-Identifier: LGPL-3.0-or-later -#include "user-client.h" -#include "query.h" #include "privates.h" #include diff --git a/src/seq/user-client.h b/src/seq/user-client.h index 592407a..33cefff 100644 --- a/src/seq/user-client.h +++ b/src/seq/user-client.h @@ -2,18 +2,7 @@ #ifndef __ALSA_GOBJECT_ALSASEQ_USER_CLIENT__H__ #define __ALSA_GOBJECT_ALSASEQ_USER_CLIENT__H__ -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include G_BEGIN_DECLS -- 2.47.3