diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/libs/client/Serializer.cpp | 4 | ||||
| -rw-r--r-- | src/libs/engine/JackMidiDriver.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 8e285ea3..9e613884 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = src patches -doc: doc/Doxyfile src/engine/*.h src/engine/*.cpp \ -src/common/util/*.h \ +doc: doc/Doxyfile src/libs/engine/*.h src/libs/engine/*.cpp \ src/common/interface/*.h \ -src/clients/*.h src/clients/*.cpp \ -src/clients/gtk/*.h src/clients/gtk/*.cpp +src/libs/client/*.h src/libs/client/*.cpp \ +src/progs/ingenuity/*.h src/progs/ingenuity/*.cpp doxygen doc/Doxyfile diff --git a/configure.ac b/configure.ac index d87e97a4..8c7d0bb3 100644 --- a/configure.ac +++ b/configure.ac @@ -219,7 +219,8 @@ if test "$build_server" = "yes" -o "$monolothic_ingenuity"; then AC_FUNC_CLOSEDIR_VOID # Check for Jack - PKG_CHECK_MODULES(JACK, jack >= 0.99.0) + # (102.20 = MIDI API changes) + PKG_CHECK_MODULES(JACK, jack >= 0.102.20) # Check for Jack MIDI if test "$build_jack_midi" = "yes"; then diff --git a/src/libs/client/Serializer.cpp b/src/libs/client/Serializer.cpp index 48d49b97..9cf7828a 100644 --- a/src/libs/client/Serializer.cpp +++ b/src/libs/client/Serializer.cpp @@ -415,8 +415,8 @@ Serializer::serialize_connection(SharedPtr<ConnectionModel> connection) throw (s { assert(_serializer); - const string node_id = connection->src_port_path().parent().name() + connection->src_port_path().name() - + connection->dst_port_path().parent().name() + connection->dst_port_path().name(); + // (Double slash intentional) + const string node_id = connection->src_port_path() + "/" + connection->dst_port_path(); //raptor_identifier* c = raptor_new_identifier(RAPTOR_IDENTIFIER_TYPE_ANONYMOUS, // NULL, RAPTOR_URI_SOURCE_BLANK_ID, (const unsigned char*)"genid1", NULL, NULL, NULL); diff --git a/src/libs/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp index 9310d1a6..016889d7 100644 --- a/src/libs/engine/JackMidiDriver.cpp +++ b/src/libs/engine/JackMidiDriver.cpp @@ -89,7 +89,7 @@ JackMidiPort::prepare_block(const SampleCount block_start, const SampleCount blo const SampleCount nframes = block_end - block_start; void* jack_buffer = jack_port_get_buffer(m_jack_port, nframes); - const jack_nframes_t event_count = jack_midi_port_get_info(jack_buffer, nframes)->event_count; + const jack_nframes_t event_count = jack_midi_get_event_count(jack_buffer, nframes); assert(event_count < m_patch_port->buffer_size()); |