]> git.alsa-project.org Git - alsa-gobject.git/commitdiff
seq: add entry header to aggregate header inclusion
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Wed, 16 Mar 2022 00:03:48 +0000 (09:03 +0900)
committer坂本 貴史 <o-takashi@sakamocchi.jp>
Thu, 17 Mar 2022 07:17:10 +0000 (16:17 +0900)
It's convenient to add header to include all of headers in regard of
documentation.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
37 files changed:
src/seq/addr.c
src/seq/addr.h
src/seq/alsaseq-enum-types.h
src/seq/alsaseq.h [new file with mode: 0644]
src/seq/client-info.h
src/seq/client-pool.h
src/seq/event-cntr.h
src/seq/event-data-connect.c
src/seq/event-data-connect.h
src/seq/event-data-ctl.c
src/seq/event-data-ctl.h
src/seq/event-data-note.c
src/seq/event-data-note.h
src/seq/event-data-queue.c
src/seq/event-data-queue.h
src/seq/event-data-result.c
src/seq/event-data-result.h
src/seq/meson.build
src/seq/port-info.h
src/seq/privates.h
src/seq/query.c
src/seq/query.h
src/seq/queue-info.h
src/seq/queue-status.h
src/seq/queue-tempo.h
src/seq/queue-timer-data-alsa.c
src/seq/queue-timer-data-alsa.h
src/seq/queue-timer.c
src/seq/queue-timer.h
src/seq/remove-filter.c
src/seq/remove-filter.h
src/seq/subscribe-data.h
src/seq/system-info.h
src/seq/tstamp.c
src/seq/tstamp.h
src/seq/user-client.c
src/seq/user-client.h

index f169b55b28d66b10008a6589c5de2f887a62dfa0..b437d3825991ec3038fd2d65499ee00540372c77 100644 (file)
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "addr.h"
+#include "privates.h"
 
 /**
  * SECTION: addr
index 14628e1567004bc96b5b89b5ed34e7e32b7ad970..e899c01edf5e464250bb6cc4f1b0756780c034b8 100644 (file)
@@ -2,10 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_ADDR__H__
 #define __ALSA_GOBJECT_ALSASEQ_ADDR__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <sound/asequencer.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index b7f3f911497c9743d50736d5d1fa69acf09166f1..b1d7c1267b4069f59620de2bbcaf6c1423e7d018 100644 (file)
@@ -2,8 +2,6 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_ENUM_TYPES__H__
 #define __ALSA_GOBJECT_ALSASEQ_ENUM_TYPES__H__
 
-#include <sound/asequencer.h>
-
 /**
  * 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 (file)
index 0000000..a51dc59
--- /dev/null
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+#ifndef __ALSA_GOBJECT_ALSASEQ__H__
+#define __ALSA_GOBJECT_ALSASEQ__H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <sound/asequencer.h>
+
+#include <alsaseq-enum-types.h>
+#include <alsaseq-enums.h>
+
+#include <tstamp.h>
+#include <addr.h>
+#include <event-data-note.h>
+#include <event-data-ctl.h>
+#include <event-data-queue.h>
+#include <event-data-connect.h>
+#include <event-data-result.h>
+#include <remove-filter.h>
+
+#include <system-info.h>
+#include <client-info.h>
+#include <client-pool.h>
+#include <port-info.h>
+#include <subscribe-data.h>
+#include <event-cntr.h>
+#include <queue-info.h>
+#include <queue-status.h>
+#include <queue-tempo.h>
+#include <queue-timer-data-alsa.h>
+#include <queue-timer.h>
+
+#include <user-client.h>
+
+#include <query.h>
+
+#endif
index 4fc1281f5bc72ca59a9c872470a2ae53f1f1cbd8..b8e7b84f5dcb2036ff4a0ffd585b30bbcd241dcc 100644 (file)
@@ -2,10 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_CLIENT_INFO__H__
 #define __ALSA_GOBJECT_ALSASEQ_CLIENT_INFO__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/alsaseq-enums.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 0048732f1c4cf0ce7404649ee819181fca7709b0..1050e00d53e3238f44ef192c51ab0473b294eb6b 100644 (file)
@@ -2,8 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_CLIENT_POOL__H__
 #define __ALSA_GOBJECT_ALSASEQ_CLIENT_POOL__H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index a8eb7649e4d179b277dd441d2599430165daee3f..cc2ec2ad0c4d23691c0ffe5c19dfcf7bba964917 100644 (file)
@@ -2,17 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_CNTR__H__
 #define __ALSA_GOBJECT_ALSASEQ_EVENT_CNTR__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/alsaseq-enums.h>
-#include <seq/tstamp.h>
-#include <seq/addr.h>
-#include <seq/event-data-note.h>
-#include <seq/event-data-ctl.h>
-#include <seq/event-data-queue.h>
-#include <seq/event-data-connect.h>
-#include <seq/event-data-result.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 5901c18169eedfb954275ad1ed84a639580c806f..1e095b5f8fe8118ef597a704dea5bf88b7008b17 100644 (file)
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "event-data-connect.h"
+#include "privates.h"
 
 /**
  * SECTION: event-data-connect
index f40c6a37511527bc17070255376f5b2dc58ecaae..04f6a737fca546ff1e99fbc72765dca40c4eff53 100644 (file)
@@ -2,12 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_CONNECT__H__
 #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_CONNECT__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/addr.h>
-
-#include <sound/asequencer.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 63ea2c6bf376e23e85688033444d42e42db4e2ae..70ab351b0be06edf9fed9586c6821817e5dce8cb 100644 (file)
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "event-data-ctl.h"
+#include "privates.h"
 
 /**
  * SECTION: event-data-ctl
index 84a033b65e927cfa7b1970eb3929f3e1b196dcf2..3936884e472fbb4936a7b1109b0b0fbac6a44d9b 100644 (file)
@@ -2,12 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_CTL__H__
 #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_CTL__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/alsaseq-enums.h>
-
-#include <sound/asequencer.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index da906e0629ef45ed2e8bef12896ab3efefcd0ba3..cd5b46b819c1bbb95f8237f88c5dfa477ff84e05 100644 (file)
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "event-data-note.h"
+#include "privates.h"
 
 /**
  * SECTION: event-data-note
index 9f36ac7dc71d10451b4869652a7baec8016791d6..2a7cb919920b230767a82381a6d344698c756a98 100644 (file)
@@ -2,10 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_NOTE__H__
 #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_NOTE__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <sound/asequencer.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index b115d17544d2c7b13e0a27de376566d54d1e3864..2a92b765ca07964fd1828e960a088c819990c3f2 100644 (file)
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "event-data-queue.h"
+#include "privates.h"
 
 /**
  * SECTION: event-data-queue
index 9d4b65ea55da80ae159275567b6329eac635413f..42ec66a9a070c1f10bde66b1794da9acf7a29110 100644 (file)
@@ -2,12 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_QUEUE_H__
 #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_QUEUE_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/tstamp.h>
-
-#include <sound/asequencer.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 0339da928b4708318ea7180820803a7dc8339632..c0741cfc3417c8b4d667974e103cba75b0575ffc 100644 (file)
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "event-data-result.h"
+#include "privates.h"
 
 /**
  * SECTION: event-data-result
index 5dd3a239f10e2a7c1a6f43039889b8498e076ec9..0510610ce46f5f2db0dc1342cd1b71923b65df8f 100644 (file)
@@ -2,12 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_RESULT__H__
 #define __ALSA_GOBJECT_ALSASEQ_EVENT_DATA_RESULT__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/alsaseq-enums.h>
-
-#include <sound/asequencer.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 1846676b98c68b1819cc0d0fa9505a4ccf8ad492..052f8ec2e9718f3c2800450c51a4dcd44131cfec 100644 (file)
@@ -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 <alsaseq.h>',
   )
 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,
 )
 
index dac749f060ea15d2cc9adb162ea13408c716a9d0..dc7764fc2db3fd8c9e189ce037f65c232bebb6f0 100644 (file)
@@ -2,11 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_PORT_INFO__H__
 #define __ALSA_GOBJECT_ALSASEQ_PORT_INFO__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/addr.h>
-#include <seq/alsaseq-enums.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 61ec8b0152479318cce36deda85486ef8114b961..1ae834f128e0d91c8bb383250522100cdaccc015 100644 (file)
@@ -2,23 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_PRIVATES__H__
 #define __ALSA_GOBJECT_ALSASEQ_PRIVATES__H__
 
-#include <string.h>
-
-#include <glib.h>
-#include <glib-object.h>
-
-#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 <sound/asequencer.h>
+#include "alsaseq.h"
 
 G_BEGIN_DECLS
 
index 682002cd366d2885910aba9c7085f4cf54272e02..da956899123b7771b0936859ec916d25d6646c35 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "query.h"
 #include "privates.h"
 
 #include <errno.h>
index a5b6f7810f609cba7224f56adec571ed80e5a709..4924d5e3ca62c6c07d2a9230ab53d9647038f6b4 100644 (file)
@@ -2,16 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_QUERY__H__
 #define __ALSA_GOBJECT_ALSASEQ_QUERY__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/system-info.h>
-#include <seq/client-info.h>
-#include <seq/port-info.h>
-#include <seq/client-pool.h>
-#include <seq/subscribe-data.h>
-#include <seq/queue-info.h>
-#include <seq/queue-status.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index f7ad958d4205d6e5f8ce78f475eb1d14a5c4809d..5f119bb6aaee5a241d59e8e561caf83b33ef6342 100644 (file)
@@ -2,8 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_INFO__H__
 #define __ALSA_GOBJECT_ALSASEQ_QUEUE_INFO__H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 5301f365698f8122b4ae3641ff6f035ada30563f..0a7fd31777de753be2ad89a34c01fea0c2a2429e 100644 (file)
@@ -2,8 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_STATUS__H__
 #define __ALSA_GOBJECT_ALSASEQ_QUEUE_STATUS__H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 158e241bfce27dde4089d8ef256b48b30165c24f..6472200443038caaee226fd188147a1bd1022ea9 100644 (file)
@@ -2,8 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_TEMPO__H__
 #define __ALSA_GOBJECT_ALSASEQ_QUEUE_TEMPO__H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 54f032666834711dc2bd09ab106919ede33a0fdb..d4b82b678606eb5257a1251e2a90f23ebb6ecd47 100644 (file)
@@ -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
index 1f70fa578b2decd09aa980bfef3732d413b86bc1..207ee3a781626c5feb25ae1e31aaf1fa6d4ca7cf 100644 (file)
@@ -2,6 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER_DATA_ALSA__H__
 #define __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER_DATA_ALSA__H__
 
+#include <alsaseq.h>
 #include <alsatimer.h>
 
 G_BEGIN_DECLS
index b8ef1ea0cd0ca34e8df29b49cf5ce1745c505050..2429bf952827cbd2f4e54a6dc7274f5d8ff1e848 100644 (file)
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "queue-timer.h"
-
-#include <sound/asequencer.h>
+#include "privates.h"
 
 /**
  * SECTION: queue-timer
index 8caf03506523b92c442c55b46a6191d182547452..99c3eda1a5647677735ce0b62ca14c2705fbcbec 100644 (file)
@@ -2,11 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER__H__
 #define __ALSA_GOBJECT_ALSASEQ_QUEUE_TIMER__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/alsaseq-enums.h>
-#include <seq/queue-timer-data-alsa.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index e0576de0830eb1353be9ad4948036234b64063c0..2d45326b52fac63397fcf9cfc969a944a42cb193 100644 (file)
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "remove-filter.h"
 #include "privates.h"
 
 #include <errno.h>
index 65a578f9812b057c6e8d05f448e9c56a81419030..b9461d3a316b32d7d9e1529f9a1118b3b8ec4815 100644 (file)
@@ -2,13 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_REMOVE_FILTER__H__
 #define __ALSA_GOBJECT_ALSASEQ_REMOVE_FILTER__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/addr.h>
-#include <seq/alsaseq-enums.h>
-
-#include <sound/asequencer.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 00e60e43037c4e2beea638ef2c5e836ef3b6be68..a0065c87b5eafac5c0ff2acf8e9753f37e5ca0ac 100644 (file)
@@ -2,11 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_SUBSCRIBE_DATA__H__
 #define __ALSA_GOBJECT_ALSASEQ_SUBSCRIBE_DATA__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/addr.h>
-#include <seq/alsaseq-enums.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index ac190e50a05ff62e2faa88def266d167ba28a82b..4219f53f45b9d858913bf21fe61754fe1529c61c 100644 (file)
@@ -2,8 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_SYSTEM_INFO__H__
 #define __ALSA_GOBJECT_ALSASEQ_SYSTEM_INFO__H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 8ab632ab6479e346e1afecfc57556829fa5cd002..09a1412b9954eb45038ea945263f8ede21b81b90 100644 (file)
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "tstamp.h"
+#include "privates.h"
 
 /**
  * SECTION: tstamp
index df6b013859b9ebcc0b6a5cbf6ac988bd47fe78cc..c8e4eb8415870daa66f2f4668d920144006e9cc5 100644 (file)
@@ -2,10 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_TSTAMP__H__
 #define __ALSA_GOBJECT_ALSASEQ_TSTAMP__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <sound/asequencer.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS
 
index 1eb6cfc5351317afda93beeef751a6ad682880e9..1e0cf863be5d5841723d9f029d428338c18ca11d 100644 (file)
@@ -1,6 +1,4 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-#include "user-client.h"
-#include "query.h"
 #include "privates.h"
 
 #include <sys/types.h>
index 592407a155717a2a66686dad09a91fea78fa167c..33cefffcd0ab05fdc9c07c413ae961160580e753 100644 (file)
@@ -2,18 +2,7 @@
 #ifndef __ALSA_GOBJECT_ALSASEQ_USER_CLIENT__H__
 #define __ALSA_GOBJECT_ALSASEQ_USER_CLIENT__H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include <seq/client-info.h>
-#include <seq/port-info.h>
-#include <seq/client-pool.h>
-#include <seq/subscribe-data.h>
-#include <seq/queue-info.h>
-#include <seq/queue-tempo.h>
-#include <seq/queue-timer.h>
-#include <seq/remove-filter.h>
-#include <seq/event-cntr.h>
+#include <alsaseq.h>
 
 G_BEGIN_DECLS