summaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/client/Serializer.cpp4
-rw-r--r--src/libs/engine/JackMidiDriver.cpp2
2 files changed, 3 insertions, 3 deletions
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());