LADI
/
spa
1
Fork 0
Code

JACK: update to newer headers 

Fixes #3181
This commit is contained in:
Wim Taymans 2023-04-28 17:32:04 +02:00
parent 56c59630c9
commit 7c5b61295d
9 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pipewire-jack/jack/control.h
View File

@ -646,7 +646,7 @@ jack_log(
const char *format,
...);
/* @} */
/**@}*/
#if 0
{ /* Adjust editor indent */

26
pipewire-jack/jack/jack.h
View File

@ -230,7 +230,7 @@ int jack_get_client_pid (const char *name) JACK_OPTIONAL_WEAK_EXPORT;
*/
jack_native_thread_t jack_client_thread_id (jack_client_t *client) JACK_OPTIONAL_WEAK_EXPORT;
/*@}*/
/**@}*/
/**
* @param client pointer to JACK client structure.
@ -289,7 +289,7 @@ void jack_cycle_signal (jack_client_t* client, int status) JACK_OPTIONAL_WEAK_EX
*/
int jack_set_process_thread(jack_client_t* client, JackThreadCallback thread_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
/*@}*/
/**@}*/
/**
* @defgroup ClientCallbacks Setting Client Callbacks
@ -557,8 +557,6 @@ int jack_set_graph_order_callback (jack_client_t *client,
int jack_set_xrun_callback (jack_client_t *client,
JackXRunCallback xrun_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
/*@}*/
/**
* Tell the Jack server to call @a latency_callback whenever it
* is necessary to recompute the latencies for some or all
@ -609,7 +607,7 @@ int jack_set_xrun_callback (jack_client_t *client,
* @ref jack_port_get_latency_range(), which only returns meaningful
* values when ports get connected and latency values change.
*
* See the documentation for @ref jack_port_set_latency_range()
* See the documentation for @ref jack_port_set_latency_range()
* on how the callback should operate. Remember that the @a mode
* argument given to the latency callback will need to be
* passed into @ref jack_port_set_latency_range()
@ -619,7 +617,7 @@ int jack_set_xrun_callback (jack_client_t *client,
int jack_set_latency_callback (jack_client_t *client,
JackLatencyCallback latency_callback,
void *) JACK_WEAK_EXPORT;
/*@}*/
/**@}*/
/**
* @defgroup ServerClientControl Controlling & querying JACK server operation
@ -706,7 +704,7 @@ int jack_engine_takeover_timebase (jack_client_t *) JACK_OPTIONAL_WEAK_DEPRECATE
*/
float jack_cpu_load (jack_client_t *client) JACK_OPTIONAL_WEAK_EXPORT;
/*@}*/
/**@}*/
/**
* @defgroup PortFunctions Creating & manipulating ports
@ -1049,10 +1047,11 @@ int jack_port_type_size(void) JACK_OPTIONAL_WEAK_EXPORT;
*/
size_t jack_port_type_get_buffer_size (jack_client_t *client, const char *port_type) JACK_WEAK_EXPORT;
/*@}*/
/**@}*/
/**
* @defgroup LatencyFunctions Managing and determining latency
* @{
*
* The purpose of JACK's latency API is to allow clients to
* easily answer two questions:
@ -1097,7 +1096,6 @@ size_t jack_port_type_get_buffer_size (jack_client_t *client, const char *port_t
* clients that add latency to the signal path should interact
* with JACK to ensure that the correct latency figures are
* used.
* @{
*/
/**
@ -1263,7 +1261,7 @@ jack_nframes_t jack_port_get_total_latency (jack_client_t *client,
*/
int jack_recompute_total_latency (jack_client_t*, jack_port_t* port) JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT;
/*@}*/
/**@}*/
/**
* @defgroup PortSearching Looking up ports
@ -1304,7 +1302,7 @@ jack_port_t * jack_port_by_name (jack_client_t *client, const char *port_name) J
jack_port_t * jack_port_by_id (jack_client_t *client,
jack_port_id_t port_id) JACK_OPTIONAL_WEAK_EXPORT;
/*@}*/
/**@}*/
/**
* @defgroup TimeFunctions Handling time
@ -1412,12 +1410,12 @@ jack_nframes_t jack_time_to_frames(const jack_client_t *client, jack_time_t) JAC
*/
jack_time_t jack_get_time(void) JACK_OPTIONAL_WEAK_EXPORT;
/*@}*/
/**@}*/
/**
* @defgroup ErrorOutput Controlling error/information output
* @{
*/
/*@{*/
/**
* Display JACK error message.
@ -1457,7 +1455,7 @@ extern void (*jack_info_callback)(const char *msg) JACK_OPTIONAL_WEAK_EXPORT;
*/
void jack_set_info_function (void (*func)(const char *)) JACK_OPTIONAL_WEAK_EXPORT;
/*@}*/
/**@}*/
/**
* The free function to be used on memory returned by jack_port_get_connections,

2
pipewire-jack/jack/midiport.h
View File

@ -185,7 +185,7 @@ jack_midi_event_write(void *port_buffer,
uint32_t
jack_midi_get_lost_event_count(void *port_buffer) JACK_OPTIONAL_WEAK_EXPORT;
/*@}*/
/**@}*/
#ifdef __cplusplus
}

4
pipewire-jack/jack/ringbuffer.h
View File

@ -50,8 +50,8 @@ jack_ringbuffer_data_t ;
typedef struct {
char *buf;
volatile size_t write_ptr;
volatile size_t read_ptr;
size_t write_ptr;
size_t read_ptr;
size_t size;
size_t size_mask;
int mlocked;

2
pipewire-jack/jack/session.h
View File

@ -33,7 +33,7 @@ extern "C" {
*
* @deprecated Use of JACK-Session is currently deprecated and unsupported.
* JACK developers recommend the use of NSM instead.
* See https://github.com/linuxaudio/new-session-manager
* See https://new-session-manager.jackaudio.org/
* @{
*/

2
pipewire-jack/jack/thread.h
View File

@ -151,7 +151,7 @@ void jack_set_thread_creator (jack_thread_creator_t creator) JACK_OPTIONAL_WEAK_
#endif
/* @} */
/**@}*/
#ifdef __cplusplus
}

2
pipewire-jack/jack/transport.h
View File

@ -238,7 +238,7 @@ void jack_get_transport_info (jack_client_t *client,
void jack_set_transport_info (jack_client_t *client,
jack_transport_info_t *tinfo) JACK_OPTIONAL_WEAK_EXPORT;
/*@}*/
/**@}*/
#ifdef __cplusplus
}

24
pipewire-jack/jack/types.h
View File

@ -538,11 +538,12 @@ typedef uint64_t jack_unique_t; /**< Unique ID (opaque) */
*/
typedef enum {
JackPositionBBT = 0x10, /**< Bar, Beat, Tick */
JackPositionTimecode = 0x20, /**< External timecode */
JackBBTFrameOffset = 0x40, /**< Frame offset of BBT information */
JackAudioVideoRatio = 0x80, /**< audio frames per video frame */
JackVideoFrameOffset = 0x100 /**< frame offset of first video frame */
JackPositionBBT = 0x10, /**< Bar, Beat, Tick */
JackPositionTimecode = 0x20, /**< External timecode */
JackBBTFrameOffset = 0x40, /**< Frame offset of BBT information */
JackAudioVideoRatio = 0x80, /**< audio frames per video frame */
JackVideoFrameOffset = 0x100, /**< frame offset of first video frame */
JackTickDouble = 0x200, /**< double-resolution tick */
} jack_position_bits_t;
@ -550,6 +551,9 @@ typedef enum {
#define JACK_POSITION_MASK (JackPositionBBT|JackPositionTimecode)
#define EXTENDED_TIME_INFO
/** transport tick_double member is available for use */
#define JACK_TICK_DOUBLE
PRE_PACKED_STRUCTURE
struct _jack_position {
@ -609,10 +613,18 @@ struct _jack_position {
set, but the value is zero, there is
no video frame within this cycle. */
/* JACK extra transport fields */
double tick_double; /**< current tick-within-beat in double resolution.
Should be assumed zero if JackTickDouble is not set.
Since older versions of JACK do not expose this variable,
the macro JACK_TICK_DOUBLE is provided,
which can be used as build-time detection. */
/* For binary compatibility, new fields should be allocated from
* this padding area with new valid bits controlling access, so
* the existing structure size and offsets are preserved. */
int32_t padding[7];
int32_t padding[5];
/* When (unique_1 == unique_2) the contents are consistent. */
jack_unique_t unique_2; /**< unique ID */

2
pipewire-jack/jack/weakjack.h
View File

@ -120,6 +120,6 @@
#endif
#endif
/*@}*/
/**@}*/
#endif /* weakjack */