io: add clock_id to clock

Can be used to determine if we need to slave or not.
Add node abi test
Fix some headers

spa/include/spa/node/io.h

@@ -121,8 +121,10 @@ struct spa_io_range {
  * since the provider was last started.
  */
 struct spa_io_clock {
-	uint32_t id;			/**< unique clock id, set by application */
 	uint32_t flags;			/**< clock flags */
+	uint32_t id;			/**< unique clock id, set by application */
+	uint32_t api;			/**< api of the clock */
+	uint32_t clock_id;		/**< api specific clock id */
 	uint64_t nsec;			/**< time in nanoseconds against monotonic clock */
 	uint64_t count;			/**< a media specific counter. Can be used to detect
 					  *  gaps in the media. It usually represents the amount
@@ -175,7 +177,7 @@ struct spa_io_segment_video {
 	uint32_t seconds;
 	uint32_t frames;
 	uint32_t field_count;		/**< 0 for progressive, 1 and 2 for interlaced */
-	uint32_t padding[17];
+	uint32_t padding[15];
 };
 
 /**
@@ -267,6 +269,7 @@ struct spa_io_rate_match {
 	double rate;			/**< rate for resampler */
 #define SPA_IO_RATE_MATCH_FLAG_ACTIVE	(1 << 0)
 	uint32_t flags;			/**< extra flags */
+	uint32_t padding[7];
 };
 
 #ifdef __cplusplus

spa/include/spa/node/node.h

@@ -34,7 +34,6 @@ extern "C" {
 #include <spa/utils/type.h>
 #include <spa/utils/hook.h>
 
-
 /**
  * A spa_node is a component that can consume and produce buffers.
  */
@@ -43,7 +42,6 @@ struct spa_node { struct spa_interface iface; };
 
 #include <spa/support/plugin.h>
 
-#include <spa/pod/builder.h>
 #include <spa/buffer/buffer.h>
 #include <spa/node/event.h>
 #include <spa/node/command.h>

spa/include/spa/node/utils.h

@@ -29,6 +29,8 @@
 extern "C" {
 #endif
 
+#include <spa/pod/builder.h>
+
 #include <spa/node/node.h>
 
 struct spa_result_node_params_data {

spa/include/spa/utils/hook.h

@@ -29,6 +29,7 @@
 extern "C" {
 #endif
 
+#include <spa/utils/defs.h>
 #include <spa/utils/list.h>
 
 /** \class spa_hook