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 <o-takashi@sakamocchi.jp>

diff --git a/src/seq/meson.build b/src/seq/meson.build
index 52095b81880b1485f04acf1cf227dffec25d34bf..1846676b98c68b1819cc0d0fa9505a4ccf8ad492 100644 (file)
--- 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 7cd50ae66532e48b6583ddfcdb73f76aba552cfb..1f70fa578b2decd09aa980bfef3732d413b86bc1 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/device-id.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/alsatimer-enum-types.h b/src/timer/alsatimer-enum-types.h
index b09599d57b37de2bbe5fc02861c0dcb2409f4cb0..b527c97702f464664fef30416f149d878c8b8ded 100644 (file)
--- 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 <sound/asound.h>
-
 /**
  * ALSATimerClass:
  * @ALSATIMER_CLASS_NONE:   Invalid.

diff --git a/src/timer/alsatimer.h b/src/timer/alsatimer.h
new file mode 100644 (file)
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 <glib.h>
+#include <glib-object.h>
+
+#include <sound/asound.h>
+
+#include <alsatimer-enum-types.h>
+#include <alsatimer-enums.h>
+
+#include <event-data-tick.h>
+#include <event-data-tstamp.h>
+#include <event.h>
+
+#include <device-id.h>
+#include <device-info.h>
+#include <device-params.h>
+#include <device-status.h>
+#include <instance-info.h>
+#include <instance-params.h>
+#include <instance-status.h>
+
+#include <user-instance.h>
+
+#include <query.h>
+
+#endif

diff --git a/src/timer/device-id.c b/src/timer/device-id.c
index 069379a9490b6305aaefceaad7ce46efd42e9f79..a1df998152b8a08a13f3e0ecd800855e0f44602f 100644 (file)
--- 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 85f9f94862b84d9f37150094fe8dc9f41dc8ae1c..e4e11649e90e079f025627870ecb36db352d39cb 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/alsatimer-enums.h>
-
-#include <sound/asound.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/device-info.h b/src/timer/device-info.h
index 19f3a6d0bbab69519072968069d45ff1de7c12bc..3e100bc82e0679a9425c3051dc2fed361f4d87e8 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/device-id.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/device-params.h b/src/timer/device-params.h
index 47c57f8f78ab6684a195e848f50a5160c79bb02f..ebc5c17f6a6e6683514288772199efb006ade0c8 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/device-id.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/device-status.h b/src/timer/device-status.h
index e608d3d4823125c5fdb1c448a76e1534627fc1c7..44c7b25c4f619bcc2c7c1e6aee78c6c8d086b9c2 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/event-data-tick.c b/src/timer/event-data-tick.c
index 4bff582e801d41296f160883dad46a3726fa08ad..dc4efe0b84c8607a36b5698bcff601d633e5d297 100644 (file)
--- 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 6bd4a79fe337d6f46d96274aabc22ce90c320696..3e67b4dae6a9824d461ba40599ad0b6e2e913c43 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <sound/asound.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/event-data-tstamp.c b/src/timer/event-data-tstamp.c
index 1eada5d000001b18005b78bfbbf77fce3fe668fb..29940441ecce541b488671080b6c7877d7539a25 100644 (file)
--- 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 7de7d5d9c1097aad62cc9eff3d29570b43fa0b7c..2c1c6da0be668c2d74790d6b7b46272f9ff25f0c 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/alsatimer-enums.h>
-
-#include <sound/asound.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/event.c b/src/timer/event.c
index f77ec9cc9dde27177e55e833cb7ddfa57535c069..cb36f94cb02ed4defeeb660aad745ea016915602 100644 (file)
--- 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 de7c629de15e5bdb5b66bb6da27576587f97db8a..13546d6ab5c98a3f4ff76d348cfe69f8a9eba325 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/event-data-tick.h>
-#include <timer/event-data-tstamp.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/instance-info.h b/src/timer/instance-info.h
index f31082eab148475c969eeabffcfe45bd53cbe69e..39074810c35465976a56d5f047132d2ddf4791cd 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/alsatimer-enums.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/instance-params.c b/src/timer/instance-params.c
index 1de2a8a1e7f8b6ec978db19639383c50dc83f680..ddade1b5769968b972ed97fe1ff3c40a12d9c798 100644 (file)
--- 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 <sound/asound.h>
-
 #include <errno.h>
 
 /**

diff --git a/src/timer/instance-params.h b/src/timer/instance-params.h
index 5c3da3999680f093068d28ef1995aacfc4412efb..6c4ff4a7699997367291d1c203eaf9123ebe3c06 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/alsatimer-enums.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/instance-status.c b/src/timer/instance-status.c
index 3ab8d015ee03ee869a9744634323a759c6c4437b..ca6f22ba686b0e810ed5b1376e91306f4bb3c3bb 100644 (file)
--- 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 <sound/asound.h>
+#include "privates.h"
 
 /**
  * SECTION: instance-status

diff --git a/src/timer/instance-status.h b/src/timer/instance-status.h
index 2521e9c95aef1551d2e4fe6419d41f39afc355aa..69d92541a1fe6ba1fe8ae82f498f1592dc8b72e8 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/meson.build b/src/timer/meson.build
index 04fc2db3e4dd1c58d37b9df545cbb80a4ce83422..a476e5f76eca2caf5cfaae342ebad96a6ce79f5a 100644 (file)
--- 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 <alsatimer.h>',
   )
 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 161cece11e3eefa2d21b6d088425bf2469bd4125..f8b2248f75c1cf079f09a1895c18236cbd45d94b 100644 (file)
--- 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 <sound/asound.h>
+#include "alsatimer.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/query.c b/src/timer/query.c
index b1a7d499a918afa79f340b0194cf18a494ef0c10..d52df29ccb84ac78fcc71acac7ad702ad4ae6052 100644 (file)
--- 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 <stdio.h>
@@ -12,7 +11,6 @@
 #include <sys/ioctl.h>
 #include <stdbool.h>
 
-#include <sound/asound.h>
 #include <time.h>
 
 #include <libudev.h>

diff --git a/src/timer/query.h b/src/timer/query.h
index 6e5e18d48cdf8cf8a7c2c241bcc451397819794a..6aa1758bf8e6d2a08f6881fb7be75120be682172 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/device-id.h>
-#include <timer/device-info.h>
-#include <timer/device-status.h>
-#include <timer/device-params.h>
-
-#include <timer/alsatimer-enums.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/timer/user-instance.c b/src/timer/user-instance.c
index e9ffa9f10632fb06302dabc16018ef08c7d36abc..8bccd6d3cb5071a9288fc60f700c3f3ebe248f6d 100644 (file)
--- 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 <sys/types.h>

diff --git a/src/timer/user-instance.h b/src/timer/user-instance.h
index 01d49e8319c5c4a12c59b972dd6bdba507940b37..8b04f41097f7dc7cab5ee89008755bd72782ae4c 100644 (file)
--- 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 <glib.h>
-#include <glib-object.h>
-
-#include <timer/device-id.h>
-#include <timer/instance-info.h>
-#include <timer/instance-params.h>
-#include <timer/instance-status.h>
-#include <timer/event.h>
+#include <alsatimer.h>
 
 G_BEGIN_DECLS