diff options
| author | David Robillard <d@drobilla.net> | 2020-11-27 20:18:41 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-11-27 21:52:29 +0100 |
| commit | 10a9f00294c3a33477dee21980f91d1417b6ef21 (patch) | |
| tree | 5fa81e66ffa8f5f22753ced48315db83a5237e9f /src/PortID.hpp | |
| parent | 2146f229086ffe26888d74fffd4bd441bfdaecbe (diff) | |
| download | patchage-10a9f00294c3a33477dee21980f91d1417b6ef21.tar.gz patchage-10a9f00294c3a33477dee21980f91d1417b6ef21.tar.bz2 patchage-10a9f00294c3a33477dee21980f91d1417b6ef21.zip | |
Ensure that ports always have an ID
Diffstat (limited to 'src/PortID.hpp')
| -rw-r--r-- | src/PortID.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/PortID.hpp b/src/PortID.hpp index c29d662..2d41f92 100644 --- a/src/PortID.hpp +++ b/src/PortID.hpp @@ -42,8 +42,8 @@ struct PortID PortID() = default; -#ifdef PATCHAGE_LIBJACK - explicit PortID(jack_port_id_t jack_id, bool = false) +#if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) + explicit PortID(uint32_t jack_id, bool = false) : type(Type::jack_id) { id.jack_id = jack_id; @@ -71,8 +71,8 @@ struct PortID union { -#ifdef PATCHAGE_LIBJACK - jack_port_id_t jack_id; +#if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) + uint32_t jack_id; #endif #ifdef HAVE_ALSA struct @@ -118,7 +118,7 @@ operator<(const PortID& a, const PortID& b) case PortID::Type::nothing: return true; case PortID::Type::jack_id: -#ifdef PATCHAGE_LIBJACK +#if defined(PATCHAGE_LIBJACK) || defined(HAVE_JACK_DBUS) return a.id.jack_id < b.id.jack_id; #endif break; |