control.h: port JACK2 API changes (jack/types.h and jack/systemdeps.h includes)

This is backport from JACK2 of portability adjustment of the control api

control.h

@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008 Nedko Arnaudov
+    Copyright (C) 2008-2003 Nedko Arnaudov
     Copyright (C) 2008 GRAME
 
     This program is free software; you can redistribute it and/or modify
@@ -26,9 +26,10 @@
 #ifndef JACK_CONTROL_H
 #define JACK_CONTROL_H
 
+#include <jack/types.h>
 #include <jack/jslist.h>
-
-#if !defined (__sun__)
+#include <jack/systemdeps.h>
+#if !defined(sun) && !defined(__sun__)
 #include <stdbool.h>
 #endif
 
@@ -78,6 +79,9 @@ extern "C" {
 } /* Adjust editor indent */
 #endif
 
+/** opaque type for sigmask object */
+typedef struct jackctl_sigmask jackctl_sigmask_t;
+
 /**
  * @defgroup ControlAPI the API for starting and controlling a JACK server
  * @{
@@ -92,7 +96,7 @@ extern "C" {
  *
  * @return the configurated signal set.
  */
-sigset_t
+jackctl_sigmask_t *
 jackctl_setup_signals(
     unsigned int flags);
 
@@ -101,9 +105,30 @@ jackctl_setup_signals(
  *
  * @param signals signals set to wait on
  */
+
 void
 jackctl_wait_signals(
-    sigset_t signals);
+    jackctl_sigmask_t * signals);
+
+
+/**
+ * Call this function after waiting on a signal set.
+ *
+ * @param signals signals set to finalize
+ */
+
+void
+jackctl_finish_signals(
+    jackctl_sigmask_t * signals);
+
+/**
+ * Call this function to get version of the JACK, in form of a string
+ *
+ * @return Human readable string describing JACK version being used.
+ *
+ */
+const char *
+jack_get_version_string(void);
 
 /**
  * Call this function to create server object.
@@ -130,7 +155,7 @@ jackctl_server_destroy(
 	jackctl_server_t * server);
 
 /**
- * Call this function to start JACK server
+ * Call this function to open JACK server
  *
  * @param server server object handle
  * @param driver driver to use
@@ -138,10 +163,21 @@ jackctl_server_destroy(
  * @return success status: true - success, false - fail
  */
 bool
-jackctl_server_start(
+jackctl_server_open(
     jackctl_server_t * server,
     jackctl_driver_t * driver);
 
+/**
+ * Call this function to start JACK server
+ *
+ * @param server server object handle
+ *
+ * @return success status: true - success, false - fail
+ */
+bool
+jackctl_server_start(
+    jackctl_server_t * server);
+
 /**
  * Call this function to stop JACK server
  *
@@ -153,6 +189,17 @@ bool
 jackctl_server_stop(
 	jackctl_server_t * server);
 
+/**
+ * Call this function to close JACK server
+ *
+ * @param server server object handle
+ *
+ * @return success status: true - success, false - fail
+ */
+bool
+jackctl_server_close(
+	jackctl_server_t * server);
+
 /**
  * Call this function to get list of available drivers. List node data
  * pointers is a driver object handle (::jackctl_driver_t).

jack.h

@@ -686,6 +686,11 @@ int jack_port_flags (const jack_port_t *port) JACK_OPTIONAL_WEAK_EXPORT;
  */
 const char *jack_port_type (const jack_port_t *port) JACK_OPTIONAL_WEAK_EXPORT;
 
+/**
+ * @return the @a port type id.
+ */
+jack_port_type_id_t jack_port_type_id (const jack_port_t *port) JACK_OPTIONAL_WEAK_EXPORT;
+
 /**
  * @return TRUE if the jack_port_t belongs to the jack_client_t.
  */

systemdeps.h

@@ -19,6 +19,9 @@
 #ifndef JACK_SYSTEMDEPS_H
 #define JACK_SYSTEMDEPS_H
 
+/* C99 uint32_t and others */
+#include <stdint.h>
+
 #ifndef POST_PACKED_STRUCTURE
 
     #ifdef __GNUC__

types.h

@@ -95,6 +95,8 @@ typedef struct _jack_client  jack_client_t;
  */
 typedef uint32_t	     jack_port_id_t;
 
+typedef int32_t jack_port_type_id_t;
+
 /**
  *  @ref jack_options_t bits
  */