Skip to content

Commit 24f4efe

Browse files
committed
Add support for upcoming metadata keys
See jackaudio/jack2#436
1 parent 210edc5 commit 24f4efe

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

jack_build.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,16 @@
277277
} jack_property_change_t;
278278
typedef void (*JackPropertyChangeCallback)(jack_uuid_t subject, const char* key, jack_property_change_t change, void* arg);
279279
int jack_set_property_change_callback(jack_client_t* client, JackPropertyChangeCallback callback, void* arg);
280-
extern const char* JACK_METADATA_PRETTY_NAME;
281-
extern const char* JACK_METADATA_HARDWARE;
282280
extern const char* JACK_METADATA_CONNECTED;
283-
extern const char* JACK_METADATA_PORT_GROUP;
284-
extern const char* JACK_METADATA_ICON_SMALL;
281+
extern const char* JACK_METADATA_EVENT_TYPES;
282+
extern const char* JACK_METADATA_HARDWARE;
285283
extern const char* JACK_METADATA_ICON_LARGE;
284+
extern const char* JACK_METADATA_ICON_NAME;
285+
extern const char* JACK_METADATA_ICON_SMALL;
286+
extern const char* JACK_METADATA_ORDER;
287+
extern const char* JACK_METADATA_PORT_GROUP;
288+
extern const char* JACK_METADATA_PRETTY_NAME;
289+
extern const char* JACK_METADATA_SIGNAL_TYPE;
286290
""")
287291

288292
# Packed structure

src/jack.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ def _decode(cdata):
7474
# Get metadata constants from library
7575
for name in dir(_lib):
7676
if name.startswith('JACK_METADATA_'):
77-
globals()[name[5:]] = _decode(getattr(_lib, name))
77+
try:
78+
globals()[name[5:]] = _decode(getattr(_lib, name))
79+
except _ffi.error:
80+
pass
7881
else:
7982
del name
8083

0 commit comments

Comments
 (0)