X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioengine.cc;h=bfdd9acd2665c0f5c5a8baca8ba1ace4153cd7eb;hb=4d112a8e6b90fa64a5cd333042044768111ba994;hp=3453deea5c700db8ab027651c05e823b0bfd5223;hpb=c831ea516791f171d2e5910baf7100af5378ee95;p=ardour.git diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 3453deea5c..bfdd9acd26 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -243,7 +243,6 @@ AudioEngine::start () error << _("Cannot create temporary MIDI port to determine MIDI buffer size") << endmsg; } else { _raw_buffer_sizes[DataType::MIDI] = jack_midi_max_event_size (jack_port_get_buffer(midi_port, blocksize)); - cerr << "MIDI port buffers = " << _raw_buffer_sizes[DataType::MIDI] << endl; jack_port_unregister (_priv_jack, midi_port); } } @@ -266,6 +265,10 @@ AudioEngine::stop (bool forever) } } + if (forever) { + stop_metering_thread (); + } + return _running ? -1 : 0; } @@ -401,7 +404,7 @@ AudioEngine::split_cycle (nframes_t offset) { /* caller must hold process lock */ - Port::increment_port_offset (offset); + AudioPort::increment_port_offset (offset); /* tell all Ports that we're going to start a new (split) cycle */ @@ -413,7 +416,7 @@ AudioEngine::split_cycle (nframes_t offset) } void -AudioEngine::finish_process_cycle (int status) +AudioEngine::finish_process_cycle (int /* status*/ ) { GET_PRIVATE_JACK_POINTER(_jack); jack_cycle_signal (_jack, 0); @@ -484,7 +487,7 @@ AudioEngine::process_callback (nframes_t nframes) /* tell all relevant objects that we're starting a new cycle */ Delivery::CycleStart (nframes); - Port::set_port_offset (0); + AudioPort::set_port_offset (0); InternalReturn::CycleStart (nframes); /* tell all Ports that we're starting a new cycle */