Skip to content

Commit 5b78c2e

Browse files
falkTXfalkTX
committed
Merge branch 'develop'
2 parents 198b1a2 + db76dd6 commit 5b78c2e

37 files changed

+31
-3732
lines changed

‎ChangeLog.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
ChangeLog
22
#########
33

4+
* 1.9.16 (2020-10-16)
5+
6+
* Fix/revert a change in how meta-data definitions were exposed (regression in 1.9.15)
7+
* Remove jack-router Windows code from the repository
8+
49
* 1.9.15 (2020-10-15)
510

611
* Automated builds for macOS and Windows (see jackaudio/jack2-releases repository)

‎common/JackConstants.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "config.h"
2525
#endif
2626

27-
#define VERSION "1.9.15"
27+
#define VERSION "1.9.16"
2828

2929
#define BUFFER_SIZE_MAX 8192
3030

‎common/JackControlAPI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ SERVER_EXPORT union jackctl_parameter_value jackctl_parameter_get_value(jackctl_
12831283
SERVER_EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
12841284
{
12851285
if (!parameter_ptr) {
1286-
return NULL;
1286+
return false;
12871287
}
12881288

12891289
if (!parameter_ptr->is_set)
@@ -1301,7 +1301,7 @@ SERVER_EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
13011301
SERVER_EXPORT bool jackctl_parameter_set_value(jackctl_parameter *parameter_ptr, const union jackctl_parameter_value * value_ptr)
13021302
{
13031303
if (!parameter_ptr || !value_ptr) {
1304-
return NULL;
1304+
return false;
13051305
}
13061306

13071307
parameter_ptr->is_set = true;

‎common/JackEngine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
3434
#include "JackChannel.h"
3535
#include "JackError.h"
3636

37-
extern const char JACK_METADATA_HARDWARE[];
38-
extern const char JACK_METADATA_PRETTY_NAME[];
37+
extern const char* JACK_METADATA_HARDWARE;
38+
extern const char* JACK_METADATA_PRETTY_NAME;
3939

4040
namespace Jack
4141
{

‎common/JackMetadata.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828

2929

3030
#define JACK_METADATA_PREFIX "http://jackaudio.org/metadata/"
31-
LIB_EXPORT extern const char JACK_METADATA_CONNECTED[] = JACK_METADATA_PREFIX "connected";
32-
LIB_EXPORT extern const char JACK_METADATA_EVENT_TYPES[] = JACK_METADATA_PREFIX "event-types";
33-
LIB_EXPORT extern const char JACK_METADATA_HARDWARE[] = JACK_METADATA_PREFIX "hardware";
34-
LIB_EXPORT extern const char JACK_METADATA_ICON_LARGE[] = JACK_METADATA_PREFIX "icon-large";
35-
LIB_EXPORT extern const char JACK_METADATA_ICON_NAME[] = JACK_METADATA_PREFIX "icon-name";
36-
LIB_EXPORT extern const char JACK_METADATA_ICON_SMALL[] = JACK_METADATA_PREFIX "icon-small";
37-
LIB_EXPORT extern const char JACK_METADATA_ORDER[] = JACK_METADATA_PREFIX "order";
38-
LIB_EXPORT extern const char JACK_METADATA_PORT_GROUP[] = JACK_METADATA_PREFIX "port-group";
39-
LIB_EXPORT extern const char JACK_METADATA_PRETTY_NAME[] = JACK_METADATA_PREFIX "pretty-name";
40-
LIB_EXPORT extern const char JACK_METADATA_SIGNAL_TYPE[] = JACK_METADATA_PREFIX "signal-type";
31+
LIB_EXPORT const char* JACK_METADATA_CONNECTED = JACK_METADATA_PREFIX "connected";
32+
LIB_EXPORT const char* JACK_METADATA_EVENT_TYPES = JACK_METADATA_PREFIX "event-types";
33+
LIB_EXPORT const char* JACK_METADATA_HARDWARE = JACK_METADATA_PREFIX "hardware";
34+
LIB_EXPORT const char* JACK_METADATA_ICON_LARGE = JACK_METADATA_PREFIX "icon-large";
35+
LIB_EXPORT const char* JACK_METADATA_ICON_NAME = JACK_METADATA_PREFIX "icon-name";
36+
LIB_EXPORT const char* JACK_METADATA_ICON_SMALL = JACK_METADATA_PREFIX "icon-small";
37+
LIB_EXPORT const char* JACK_METADATA_ORDER = JACK_METADATA_PREFIX "order";
38+
LIB_EXPORT const char* JACK_METADATA_PORT_GROUP = JACK_METADATA_PREFIX "port-group";
39+
LIB_EXPORT const char* JACK_METADATA_PRETTY_NAME = JACK_METADATA_PREFIX "pretty-name";
40+
LIB_EXPORT const char* JACK_METADATA_SIGNAL_TYPE = JACK_METADATA_PREFIX "signal-type";
4141
#undef JACK_METADATA_PREFIX
4242

4343
namespace Jack

‎common/jack/metadata.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ int jack_set_property_change_callback (jack_client_t* client,
229229
* A value that identifies what the hardware port is connected to (an external
230230
* device of some kind). Possible values might be "E-Piano" or "Master 2 Track".
231231
*/
232-
extern const char JACK_METADATA_CONNECTED[];
232+
extern const char* JACK_METADATA_CONNECTED;
233233

234234
/**
235235
* The supported event types of an event port.
@@ -242,21 +242,21 @@ extern const char JACK_METADATA_CONNECTED[];
242242
* status byte will gracefully ignore OSC messages if the user makes an
243243
* inappropriate connection.
244244
*/
245-
extern const char JACK_METADATA_EVENT_TYPES[];
245+
extern const char* JACK_METADATA_EVENT_TYPES;
246246

247247
/**
248248
* A value that should be shown when attempting to identify the
249249
* specific hardware outputs of a client. Typical values might be
250250
* "ADAT1", "S/PDIF L" or "MADI 43".
251251
*/
252-
extern const char JACK_METADATA_HARDWARE[];
252+
extern const char* JACK_METADATA_HARDWARE;
253253

254254
/**
255255
* A value with a MIME type of "image/png;base64" that is an encoding of an
256256
* NxN (with 32 < N <= 128) image to be used when displaying a visual
257257
* representation of that client or port.
258258
*/
259-
extern const char JACK_METADATA_ICON_LARGE[];
259+
extern const char* JACK_METADATA_ICON_LARGE;
260260

261261
/**
262262
* The name of the icon for the subject (typically client).
@@ -267,14 +267,14 @@ extern const char JACK_METADATA_ICON_LARGE[];
267267
* Theme Specification:
268268
* https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
269269
*/
270-
extern const char JACK_METADATA_ICON_NAME[];
270+
extern const char* JACK_METADATA_ICON_NAME;
271271

272272
/**
273273
* A value with a MIME type of "image/png;base64" that is an encoding of an
274274
* NxN (with N <=32) image to be used when displaying a visual representation
275275
* of that client or port.
276276
*/
277-
extern const char JACK_METADATA_ICON_SMALL[];
277+
extern const char* JACK_METADATA_ICON_SMALL;
278278

279279
/**
280280
* Order for a port.
@@ -287,18 +287,18 @@ extern const char JACK_METADATA_ICON_SMALL[];
287287
*
288288
* It is encouraged to use http://www.w3.org/2001/XMLSchema#int as the type.
289289
*/
290-
extern const char JACK_METADATA_ORDER[];
290+
extern const char* JACK_METADATA_ORDER;
291291

292292
/**
293293
* A value that should be shown to the user when displaying a port to the user,
294294
* unless the user has explicitly overridden that a request to show the port
295295
* name, or some other key value.
296296
*/
297-
extern const char JACK_METADATA_PRETTY_NAME[];
297+
extern const char* JACK_METADATA_PRETTY_NAME;
298298

299299
/**
300300
*/
301-
extern const char JACK_METADATA_PORT_GROUP[];
301+
extern const char* JACK_METADATA_PORT_GROUP;
302302

303303
/**
304304
* The type of an audio signal.
@@ -309,7 +309,7 @@ extern const char JACK_METADATA_PORT_GROUP[];
309309
* their output directly to speakers. In particular, CV ports are not
310310
* necessarily periodic at all and may have very high DC.
311311
*/
312-
extern const char JACK_METADATA_SIGNAL_TYPE[];
312+
extern const char* JACK_METADATA_SIGNAL_TYPE;
313313

314314
/**
315315
* @}

0 commit comments

Comments
 (0)