From 630c3035331c37965767e2ead8d52c692523fd23 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 6 Oct 2019 16:50:13 +0100 Subject: [PATCH] Fix build issue triggered by last branch merge --- common/JackLibAPI.cpp | 14 -------------- common/JackMetadata.cpp | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp index 3c535d43..e439f473 100644 --- a/common/JackLibAPI.cpp +++ b/common/JackLibAPI.cpp @@ -47,20 +47,6 @@ extern "C" LIB_EXPORT int jack_client_close (jack_client_t *client); LIB_EXPORT int jack_get_client_pid (const char *name); - // Metadata API - #define JACK_METADATA_PREFIX "http://jackaudio.org/metadata/" - LIB_EXPORT const char* JACK_METADATA_CONNECTED = JACK_METADATA_PREFIX "connected"; - LIB_EXPORT const char* JACK_METADATA_EVENT_TYPES = JACK_METADATA_PREFIX "event-types"; - LIB_EXPORT const char* JACK_METADATA_HARDWARE = JACK_METADATA_PREFIX "hardware"; - LIB_EXPORT const char* JACK_METADATA_ICON_LARGE = JACK_METADATA_PREFIX "icon-large"; - LIB_EXPORT const char* JACK_METADATA_ICON_NAME = JACK_METADATA_PREFIX "icon-name"; - LIB_EXPORT const char* JACK_METADATA_ICON_SMALL = JACK_METADATA_PREFIX "icon-small"; - LIB_EXPORT const char* JACK_METADATA_ORDER = JACK_METADATA_PREFIX "order"; - LIB_EXPORT const char* JACK_METADATA_PORT_GROUP = JACK_METADATA_PREFIX "port-group"; - LIB_EXPORT const char* JACK_METADATA_PRETTY_NAME = JACK_METADATA_PREFIX "pretty-name"; - LIB_EXPORT const char* JACK_METADATA_SIGNAL_TYPE = JACK_METADATA_PREFIX "signal-type"; - #undef JACK_METADATA_PREFIX - LIB_EXPORT int jack_set_property(jack_client_t*, jack_uuid_t subject, const char* key, const char* value, const char* type); LIB_EXPORT int jack_get_property(jack_uuid_t subject, const char* key, char** value, char** type); LIB_EXPORT void jack_free_description(jack_description_t* desc, int free_description_itself); diff --git a/common/JackMetadata.cpp b/common/JackMetadata.cpp index 75d4b3b5..0136b25b 100644 --- a/common/JackMetadata.cpp +++ b/common/JackMetadata.cpp @@ -27,12 +27,18 @@ #include -LIB_EXPORT const char* JACK_METADATA_PRETTY_NAME = "http://jackaudio.org/metadata/pretty-name"; -LIB_EXPORT const char* JACK_METADATA_HARDWARE = "http://jackaudio.org/metadata/hardware"; -LIB_EXPORT const char* JACK_METADATA_CONNECTED = "http://jackaudio.org/metadata/connected"; -LIB_EXPORT const char* JACK_METADATA_PORT_GROUP = "http://jackaudio.org/metadata/port-group"; -LIB_EXPORT const char* JACK_METADATA_ICON_SMALL = "http://jackaudio.org/metadata/icon-small"; -LIB_EXPORT const char* JACK_METADATA_ICON_LARGE = "http://jackaudio.org/metadata/icon-large"; +#define JACK_METADATA_PREFIX "http://jackaudio.org/metadata/" +LIB_EXPORT const char* JACK_METADATA_CONNECTED = JACK_METADATA_PREFIX "connected"; +LIB_EXPORT const char* JACK_METADATA_EVENT_TYPES = JACK_METADATA_PREFIX "event-types"; +LIB_EXPORT const char* JACK_METADATA_HARDWARE = JACK_METADATA_PREFIX "hardware"; +LIB_EXPORT const char* JACK_METADATA_ICON_LARGE = JACK_METADATA_PREFIX "icon-large"; +LIB_EXPORT const char* JACK_METADATA_ICON_NAME = JACK_METADATA_PREFIX "icon-name"; +LIB_EXPORT const char* JACK_METADATA_ICON_SMALL = JACK_METADATA_PREFIX "icon-small"; +LIB_EXPORT const char* JACK_METADATA_ORDER = JACK_METADATA_PREFIX "order"; +LIB_EXPORT const char* JACK_METADATA_PORT_GROUP = JACK_METADATA_PREFIX "port-group"; +LIB_EXPORT const char* JACK_METADATA_PRETTY_NAME = JACK_METADATA_PREFIX "pretty-name"; +LIB_EXPORT const char* JACK_METADATA_SIGNAL_TYPE = JACK_METADATA_PREFIX "signal-type"; +#undef JACK_METADATA_PREFIX namespace Jack { -- 2.11.4.GIT