allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

(1) silence non-process FIFO message (2) move MIDI state tracking down to the MidiPort level (3) forward port the PRIVATE_JACK pointer "fix" from 2.X

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5774 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2009-10-14 17:35:33 +00:00
parent bb9cc45cd2
commit 07be98b341
14 changed files with 209 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/route_ui.cc
View File

@@ -45,6 +45,7 @@
#include "automation_time_axis.h"
#include "ardour/route.h"
#include "ardour/event_type_map.h"
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "ardour/audio_track.h"

34
libs/ardour/ardour/audioengine.h
View File

@@ -82,26 +82,31 @@ class AudioEngine : public sigc::trackable
bool get_sync_offset (nframes_t& offset) const;
nframes_t frames_since_cycle_start () {
if (!_running || !_jack) return 0;
return jack_frames_since_cycle_start (_jack);
jack_client_t* _priv_jack = _jack;
if (!_running || !_priv_jack) return 0;
return jack_frames_since_cycle_start (_priv_jack);
}
nframes_t frame_time () {
if (!_running || !_jack) return 0;
return jack_frame_time (_jack);
jack_client_t* _priv_jack = _jack;
if (!_running || !_priv_jack) return 0;
return jack_frame_time (_priv_jack);
}
nframes_t transport_frame () const {
if (!_running || !_jack) return 0;
return jack_get_current_transport_frame (_jack);
const jack_client_t* _priv_jack = _jack;
if (!_running || !_priv_jack) return 0;
return jack_get_current_transport_frame (_priv_jack);
}
int request_buffer_size (nframes_t);
nframes_t set_monitor_check_interval (nframes_t);
nframes_t processed_frames() const { return _processed_frames; }
float get_cpu_load() {
if (!_running || !_jack) return 0;
return jack_cpu_load (_jack);
jack_client_t* _priv_jack = _jack;
if (!_running || !_priv_jack) return 0;
return jack_cpu_load (_priv_jack);
}
void set_session (Session *);
@@ -177,7 +182,7 @@ class AudioEngine : public sigc::trackable
bool freewheeling() const { return _freewheeling; }
/* this signal is sent for every process() cycle while freewheeling.
the regular process() call to session->process() is not made.
_ the regular process() call to session->process() is not made.
*/
sigc::signal<int,nframes_t> Freewheel;
@@ -210,9 +215,14 @@ class AudioEngine : public sigc::trackable
std::string make_port_name_relative (std::string);
std::string make_port_name_non_relative (std::string);
static AudioEngine* instance() { return _instance; }
void died ();
private:
static AudioEngine* _instance;
ARDOUR::Session* session;
jack_client_t* _jack;
jack_client_t* volatile _jack; /* could be reset to null by SIGPIPE or another thread */
std::string jack_client_name;
Glib::Mutex _process_lock;
Glib::Cond session_removed;
@@ -261,10 +271,10 @@ class AudioEngine : public sigc::trackable
int jack_bufsize_callback (nframes_t);
int jack_sample_rate_callback (nframes_t);
static void halted (void *);
int connect_to_jack (std::string client_name);
static void halted (void *);
void meter_thread ();
void start_metering_thread ();
void stop_metering_thread ();

5
libs/ardour/ardour/delivery.h
View File

@@ -68,9 +68,10 @@ public:
void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
/* supplemental method use with MIDI */
/* supplemental method used with MIDI */
void flush (nframes_t nframes);
void flush (nframes_t nframes, nframes64_t time);
void transport_stopped ();
void no_outs_cuz_we_no_monitor(bool);

7
libs/ardour/ardour/midi_port.h
View File

@@ -23,6 +23,7 @@
#include "ardour/port.h"
#include "ardour/midi_buffer.h"
#include "ardour/midi_state_tracker.h"
namespace ARDOUR {
@@ -39,7 +40,9 @@ class MidiPort : public Port {
void cycle_start (nframes_t nframes);
void cycle_end (nframes_t nframes);
void cycle_split ();
void flush_buffers (nframes_t nframes, nframes_t offset = 0);
void flush_buffers (nframes_t nframes, nframes64_t time, nframes_t offset = 0);
void transport_stopped ();
size_t raw_buffer_size(jack_nframes_t nframes) const;
@@ -57,7 +60,9 @@ class MidiPort : public Port {
private:
MidiBuffer* _buffer;
bool _has_been_mixed_down;
bool _resolve_in_process;
MidiStateTracker _midi_state_tracker;
};
} // namespace ARDOUR

2
libs/ardour/ardour/midi_state_tracker.h
View File

@@ -36,7 +36,7 @@ public:
MidiStateTracker();
void track (const MidiBuffer::iterator& from, const MidiBuffer::iterator& to, bool& looped);
void resolve_notes (MidiBuffer& buffer, nframes_t time);
void resolve_notes (MidiBuffer& buffer, nframes64_t time);
void dump (std::ostream&);
void reset ();

3
libs/ardour/ardour/midi_track.h
View File

@@ -22,7 +22,6 @@
#include "ardour/track.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/midi_state_tracker.h"
namespace ARDOUR
{
@@ -105,8 +104,6 @@ private:
void set_state_part_two ();
void set_state_part_three ();
MidiStateTracker _midi_state_tracker;
MidiRingBuffer<nframes_t> _immediate_events;
MidiRingBuffer<nframes_t> _step_edit_ring_buffer;
NoteMode _note_mode;

3
libs/ardour/ardour/port.h
View File

@@ -110,9 +110,10 @@ public:
virtual void cycle_end (nframes_t) = 0;
virtual void cycle_split () = 0;
virtual Buffer& get_buffer (nframes_t nframes, nframes_t offset = 0) = 0;
virtual void flush_buffers (nframes_t, nframes_t offset = 0) {
virtual void flush_buffers (nframes_t nframes, nframes64_t /*time*/, nframes_t offset = 0) {
(void) offset;
}
virtual void transport_stopped () {}
static void set_engine (AudioEngine *);

311
libs/ardour/audioengine.cc
View File

@@ -56,10 +56,16 @@ using namespace ARDOUR;
using namespace PBD;
gint AudioEngine::m_meter_exit;
AudioEngine* AudioEngine::_instance = 0;
#define GET_PRIVATE_JACK_POINTER(j) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return; }
#define GET_PRIVATE_JACK_POINTER_RET(j,r) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return r; }
AudioEngine::AudioEngine (string client_name)
: ports (new Ports)
{
_instance = this; /* singleton */
session = 0;
session_remove_pending = false;
_running = false;
@@ -138,20 +144,17 @@ _thread_init_callback (void * /*arg*/)
int
AudioEngine::start ()
{
if (!_jack) {
error << _("AudioEngine::start() called while disconnected from JACK") << endmsg;
return -1;
}
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (!_running) {
nframes_t blocksize = jack_get_buffer_size (_jack);
nframes_t blocksize = jack_get_buffer_size (_priv_jack);
if (session) {
BootMessage (_("Connect session to engine"));
session->set_block_size (blocksize);
session->set_frame_rate (jack_get_sample_rate (_jack));
session->set_frame_rate (jack_get_sample_rate (_priv_jack));
/* page in as much of the session process code as we
can before we really start running.
@@ -170,22 +173,22 @@ AudioEngine::start ()
_processed_frames = 0;
last_monitor_check = 0;
jack_on_shutdown (_jack, halted, this);
jack_set_graph_order_callback (_jack, _graph_order_callback, this);
jack_set_thread_init_callback (_jack, _thread_init_callback, this);
jack_set_process_callback (_jack, _process_callback, this);
jack_set_sample_rate_callback (_jack, _sample_rate_callback, this);
jack_set_buffer_size_callback (_jack, _bufsize_callback, this);
jack_set_xrun_callback (_jack, _xrun_callback, this);
jack_set_sync_callback (_jack, _jack_sync_callback, this);
jack_set_freewheel_callback (_jack, _freewheel_callback, this);
jack_set_port_registration_callback (_jack, _registration_callback, this);
jack_on_shutdown (_priv_jack, halted, this);
jack_set_graph_order_callback (_priv_jack, _graph_order_callback, this);
jack_set_thread_init_callback (_priv_jack, _thread_init_callback, this);
jack_set_process_callback (_priv_jack, _process_callback, this);
jack_set_sample_rate_callback (_priv_jack, _sample_rate_callback, this);
jack_set_buffer_size_callback (_priv_jack, _bufsize_callback, this);
jack_set_xrun_callback (_priv_jack, _xrun_callback, this);
jack_set_sync_callback (_priv_jack, _jack_sync_callback, this);
jack_set_freewheel_callback (_priv_jack, _freewheel_callback, this);
jack_set_port_registration_callback (_priv_jack, _registration_callback, this);
if (session && session->config.get_jack_time_master()) {
jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this);
jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
}
if (jack_activate (_jack) == 0) {
if (jack_activate (_priv_jack) == 0) {
_running = true;
_has_run = true;
Running(); /* EMIT SIGNAL */
@@ -204,11 +207,13 @@ AudioEngine::start ()
int
AudioEngine::stop (bool forever)
{
if (_jack) {
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (_priv_jack) {
if (forever) {
disconnect_from_jack ();
} else {
jack_deactivate (_jack);
jack_deactivate (_priv_jack);
Stopped(); /* EMIT SIGNAL */
}
}
@@ -223,10 +228,12 @@ AudioEngine::get_sync_offset (nframes_t& offset) const
#ifdef HAVE_JACK_VIDEO_SUPPORT
GET_PRIVATE_JACK_POINTER_RET (_jack, false);
jack_position_t pos;
if (_jack) {
(void) jack_transport_query (_jack, &pos);
if (_priv_jack) {
(void) jack_transport_query (_priv_jack, &pos);
if (pos.valid & JackVideoFrameOffset) {
offset = pos.video_offset;
@@ -340,8 +347,8 @@ AudioEngine::split_cycle (nframes_t offset)
int
AudioEngine::process_callback (nframes_t nframes)
{
GET_PRIVATE_JACK_POINTER_RET(_jack,0)
// CycleTimer ct ("AudioEngine::process");
Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK);
/// The number of frames that will have been processed when we've finished
@@ -387,7 +394,7 @@ AudioEngine::process_callback (nframes_t nframes)
if (_freewheeling) {
/* emit the Freewheel signal and stop freewheeling in the event of trouble */
if (Freewheel (nframes)) {
jack_set_freewheel (_jack, false);
jack_set_freewheel (_priv_jack, false);
}
} else {
@@ -594,12 +601,13 @@ AudioEngine::remove_session ()
void
AudioEngine::port_registration_failure (const std::string& portname)
{
GET_PRIVATE_JACK_POINTER (_jack);
string full_portname = jack_client_name;
full_portname += ':';
full_portname += portname;
jack_port_t* p = jack_port_by_name (_jack, full_portname.c_str());
jack_port_t* p = jack_port_by_name (_priv_jack, full_portname.c_str());
string reason;
if (p) {
@@ -711,10 +719,11 @@ AudioEngine::connect (const string& source, const string& destination)
string s = make_port_name_non_relative (source);
string d = make_port_name_non_relative (destination);
Port* src = get_port_by_name_locked (s);
Port* dst = get_port_by_name_locked (d);
if (src) {
if (src) {
ret = src->connect (d);
} else if (dst) {
ret = dst->connect (s);
@@ -770,6 +779,8 @@ AudioEngine::disconnect (const string& source, const string& destination)
int
AudioEngine::disconnect (Port& port)
{
GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
if (!_running) {
if (!_has_run) {
fatal << _("disconnect called before engine was started") << endmsg;
@@ -785,17 +796,11 @@ AudioEngine::disconnect (Port& port)
ARDOUR::nframes_t
AudioEngine::frame_rate ()
{
if (_jack) {
if (_frame_rate == 0) {
return (_frame_rate = jack_get_sample_rate (_jack));
} else {
return _frame_rate;
}
GET_PRIVATE_JACK_POINTER_RET (_jack,0);
if (_frame_rate == 0) {
return (_frame_rate = jack_get_sample_rate (_priv_jack));
} else {
fatal << X_("programming error: AudioEngine::frame_rate() called while disconnected from JACK")
<< endmsg;
/*NOTREACHED*/
return 0;
return _frame_rate;
}
}
@@ -809,17 +814,11 @@ AudioEngine::raw_buffer_size (DataType t)
ARDOUR::nframes_t
AudioEngine::frames_per_cycle ()
{
if (_jack) {
if (_buffer_size == 0) {
return (_buffer_size = jack_get_buffer_size (_jack));
} else {
return _buffer_size;
}
GET_PRIVATE_JACK_POINTER_RET (_jack,0);
if (_buffer_size == 0) {
return (_buffer_size = jack_get_buffer_size (_jack));
} else {
fatal << X_("programming error: AudioEngine::frame_rate() called while disconnected from JACK")
<< endmsg;
/*NOTREACHED*/
return 0;
return _buffer_size;
}
}
@@ -873,13 +872,10 @@ AudioEngine::get_port_by_name_locked (const string& portname)
return 0;
}
const char **
AudioEngine::get_ports (const string& port_name_pattern, const string& type_name_pattern, uint32_t flags)
{
GET_PRIVATE_JACK_POINTER_RET (_jack,0);
if (!_running) {
if (!_has_run) {
fatal << _("get_ports called before engine was started") << endmsg;
@@ -888,12 +884,14 @@ AudioEngine::get_ports (const string& port_name_pattern, const string& type_name
return 0;
}
}
return jack_get_ports (_jack, port_name_pattern.c_str(), type_name_pattern.c_str(), flags);
return jack_get_ports (_priv_jack, port_name_pattern.c_str(), type_name_pattern.c_str(), flags);
}
void
AudioEngine::halted (void *arg)
{
/* called from jack shutdown handler */
AudioEngine* ae = static_cast<AudioEngine *> (arg);
bool was_running = ae->_running;
@@ -908,16 +906,26 @@ AudioEngine::halted (void *arg)
}
}
void
AudioEngine::died ()
{
/* called from a signal handler for SIGPIPE */
stop_metering_thread ();
_running = false;
_buffer_size = 0;
_frame_rate = 0;
_jack = 0;
}
bool
AudioEngine::can_request_hardware_monitoring ()
{
GET_PRIVATE_JACK_POINTER_RET (_jack,false);
const char ** ports;
if (!_jack) {
return 0;
}
if ((ports = jack_get_ports (_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
return false;
}
@@ -930,14 +938,11 @@ AudioEngine::can_request_hardware_monitoring ()
uint32_t
AudioEngine::n_physical_outputs (DataType type) const
{
GET_PRIVATE_JACK_POINTER_RET (_jack,0);
const char ** ports;
uint32_t i = 0;
if (!_jack) {
return 0;
}
if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
return 0;
}
@@ -950,35 +955,29 @@ AudioEngine::n_physical_outputs (DataType type) const
uint32_t
AudioEngine::n_physical_inputs (DataType type) const
{
GET_PRIVATE_JACK_POINTER_RET (_jack,0);
const char ** ports;
uint32_t i = 0;
if (!_jack) {
if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
return 0;
}
if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
return 0;
}
for (i = 0; ports[i]; ++i) {}
free (ports);
if (ports) {
for (i = 0; ports[i]; ++i) {}
free (ports);
}
return i;
}
void
AudioEngine::get_physical_inputs (DataType type, vector<string>& ins)
{
GET_PRIVATE_JACK_POINTER (_jack);
const char ** ports;
uint32_t i = 0;
if (!_jack) {
return;
}
if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
return;
}
@@ -993,47 +992,32 @@ AudioEngine::get_physical_inputs (DataType type, vector<string>& ins)
void
AudioEngine::get_physical_outputs (DataType type, vector<string>& outs)
{
GET_PRIVATE_JACK_POINTER (_jack);
const char ** ports;
uint32_t i = 0;
if (!_jack) {
if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
return;
}
if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
return;
}
if (ports) {
for (i = 0; ports[i]; ++i) {
outs.push_back (ports[i]);
}
free (ports);
for (i = 0; ports[i]; ++i) {
outs.push_back (ports[i]);
}
free (ports);
}
string
AudioEngine::get_nth_physical (DataType type, uint32_t n, int flag)
{
GET_PRIVATE_JACK_POINTER_RET (_jack,"");
const char ** ports;
uint32_t i;
string ret;
assert(type != DataType::NIL);
if (!_running || !_jack) {
if (!_has_run) {
fatal << _("get_nth_physical called before engine was started") << endmsg;
/*NOTREACHED*/
} else {
return "";
}
}
ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|flag);
if (ports == 0) {
return "";
if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|flag)) == 0) {
return ret;
}
for (i = 0; i < n && ports[i]; ++i) {}
@@ -1050,91 +1034,69 @@ AudioEngine::get_nth_physical (DataType type, uint32_t n, int flag)
void
AudioEngine::update_total_latency (const Port& port)
{
if (!_jack) {
fatal << _("update_total_latency() called with no JACK client connection") << endmsg;
/*NOTREACHED*/
}
if (!_running) {
if (!_has_run) {
fatal << _("update_total_latency() called before engine was started") << endmsg;
/*NOTREACHED*/
}
}
port.recompute_total_latency ();
}
void
AudioEngine::transport_stop ()
{
if (_jack) {
jack_transport_stop (_jack);
}
GET_PRIVATE_JACK_POINTER (_jack);
jack_transport_stop (_priv_jack);
}
void
AudioEngine::transport_start ()
{
if (_jack) {
jack_transport_start (_jack);
}
GET_PRIVATE_JACK_POINTER (_jack);
jack_transport_start (_priv_jack);
}
void
AudioEngine::transport_locate (nframes_t where)
{
GET_PRIVATE_JACK_POINTER (_jack);
// cerr << "tell JACK to locate to " << where << endl;
if (_jack) {
jack_transport_locate (_jack, where);
}
jack_transport_locate (_priv_jack, where);
}
AudioEngine::TransportState
AudioEngine::transport_state ()
{
if (_jack) {
jack_position_t pos;
return (TransportState) jack_transport_query (_jack, &pos);
} else {
return (TransportState) JackTransportStopped;
}
GET_PRIVATE_JACK_POINTER_RET (_jack, ((TransportState) JackTransportStopped));
jack_position_t pos;
return (TransportState) jack_transport_query (_priv_jack, &pos);
}
int
AudioEngine::reset_timebase ()
{
if (_jack && session) {
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (session) {
if (session->config.get_jack_time_master()) {
return jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this);
return jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
} else {
return jack_release_timebase (_jack);
}
} else {
return -1;
}
return 0;
}
int
AudioEngine::freewheel (bool onoff)
{
if (_jack) {
if (onoff != _freewheeling) {
if (onoff) {
_freewheel_thread_registered = false;
}
return jack_set_freewheel (_jack, onoff);
} else {
/* already doing what has been asked for */
return 0;
}
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (onoff != _freewheeling) {
if (onoff) {
_freewheel_thread_registered = false;
}
return jack_set_freewheel (_priv_jack, onoff);
} else {
return -1;
/* already doing what has been asked for */
return 0;
}
}
@@ -1176,8 +1138,10 @@ AudioEngine::connect_to_jack (string client_name)
return -1;
}
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (status & JackNameNotUnique) {
jack_client_name = jack_get_client_name (_jack);
jack_client_name = jack_get_client_name (_priv_jack);
}
jack_set_error_function (ardour_jack_error);
@@ -1188,9 +1152,7 @@ AudioEngine::connect_to_jack (string client_name)
int
AudioEngine::disconnect_from_jack ()
{
if (!_jack) {
return 0;
}
GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
if (_running) {
stop_metering_thread ();
@@ -1198,7 +1160,7 @@ AudioEngine::disconnect_from_jack ()
{
Glib::Mutex::Lock lm (_process_lock);
jack_client_close (_jack);
jack_client_close (_priv_jack);
_jack = 0;
}
@@ -1244,12 +1206,13 @@ AudioEngine::reconnect_to_jack ()
return -1;
}
GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
if (session) {
session->reset_jack_connection (_jack);
nframes_t blocksize = jack_get_buffer_size (_jack);
session->reset_jack_connection (_priv_jack);
nframes_t blocksize = jack_get_buffer_size (_priv_jack);
session->set_block_size (blocksize);
session->set_frame_rate (jack_get_sample_rate (_jack));
session->set_frame_rate (jack_get_sample_rate (_priv_jack));
_raw_buffer_sizes[DataType::AUDIO] = blocksize * sizeof(float);
cout << "FIXME: Assuming maximum MIDI buffer size " << blocksize * 4 << "bytes" << endl;
@@ -1258,21 +1221,21 @@ AudioEngine::reconnect_to_jack ()
last_monitor_check = 0;
jack_on_shutdown (_jack, halted, this);
jack_set_graph_order_callback (_jack, _graph_order_callback, this);
jack_set_thread_init_callback (_jack, _thread_init_callback, this);
jack_set_process_callback (_jack, _process_callback, this);
jack_set_sample_rate_callback (_jack, _sample_rate_callback, this);
jack_set_buffer_size_callback (_jack, _bufsize_callback, this);
jack_set_xrun_callback (_jack, _xrun_callback, this);
jack_set_sync_callback (_jack, _jack_sync_callback, this);
jack_set_freewheel_callback (_jack, _freewheel_callback, this);
jack_on_shutdown (_priv_jack, halted, this);
jack_set_graph_order_callback (_priv_jack, _graph_order_callback, this);
jack_set_thread_init_callback (_priv_jack, _thread_init_callback, this);
jack_set_process_callback (_priv_jack, _process_callback, this);
jack_set_sample_rate_callback (_priv_jack, _sample_rate_callback, this);
jack_set_buffer_size_callback (_priv_jack, _bufsize_callback, this);
jack_set_xrun_callback (_priv_jack, _xrun_callback, this);
jack_set_sync_callback (_priv_jack, _jack_sync_callback, this);
jack_set_freewheel_callback (_priv_jack, _freewheel_callback, this);
if (session && session->config.get_jack_time_master()) {
jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this);
jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
}
if (jack_activate (_jack) == 0) {
if (jack_activate (_priv_jack) == 0) {
_running = true;
_has_run = true;
} else {
@@ -1295,26 +1258,21 @@ AudioEngine::reconnect_to_jack ()
int
AudioEngine::request_buffer_size (nframes_t nframes)
{
if (_jack) {
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (nframes == jack_get_buffer_size (_jack)) {
return 0;
}
return jack_set_buffer_size (_jack, nframes);
} else {
return -1;
if (nframes == jack_get_buffer_size (_priv_jack)) {
return 0;
}
return jack_set_buffer_size (_priv_jack, nframes);
}
void
AudioEngine::update_total_latencies ()
{
#ifdef HAVE_JACK_RECOMPUTE_LATENCIES
if (_jack) {
jack_recompute_total_latencies (_jack);
}
GET_PRIVATE_JACK_POINTER (_jack);
jack_recompute_total_latencies (_priv_jack);
#endif
}
@@ -1358,9 +1316,6 @@ AudioEngine::make_port_name_non_relative (string portname)
bool
AudioEngine::is_realtime () const
{
if (_jack) {
return jack_is_realtime (_jack);
} else {
return false;
}
GET_PRIVATE_JACK_POINTER_RET (_jack,false);
return jack_is_realtime (_priv_jack);
}

16
libs/ardour/delivery.cc
View File

@@ -490,14 +490,26 @@ Delivery::transport_stopped (sframes_t frame)
}
void
Delivery::flush (nframes_t nframes)
Delivery::flush (nframes_t nframes, nframes64_t time)
{
/* io_lock, not taken: function must be called from Session::process() calltree */
PortSet& ports (_output->ports());
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
(*i).flush_buffers (nframes, _output_offset);
(*i).flush_buffers (nframes, time, _output_offset);
}
}
void
Delivery::transport_stopped ()
{
/* turn off any notes that are on */
PortSet& ports (_output->ports());
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
(*i).transport_stopped ();
}
}

21
libs/ardour/midi_port.cc
View File

@@ -28,6 +28,7 @@ using namespace std;
MidiPort::MidiPort (const std::string& name, Flags flags)
: Port (name, DataType::MIDI, flags)
, _has_been_mixed_down (false)
, _resolve_in_process (false)
{
_buffer = new MidiBuffer (raw_buffer_size(0));
}
@@ -108,12 +109,24 @@ MidiPort::cycle_split ()
}
void
MidiPort::flush_buffers (nframes_t nframes, nframes_t offset)
MidiPort::flush_buffers (nframes_t nframes, nframes64_t time, nframes_t offset)
{
if (sends_output ()) {
void* jack_buffer = jack_port_get_buffer (_jack_port, nframes);
// Feed the data through the MidiStateTracker
bool did_loop;
_midi_state_tracker.track (_buffer->begin(), _buffer->end(), did_loop);
if (did_loop || _resolve_in_process) {
/* add necessary note offs */
_midi_state_tracker.resolve_notes (*_buffer, time);
}
_resolve_in_process = false;
for (MidiBuffer::iterator i = _buffer->begin(); i != _buffer->end(); ++i) {
const Evoral::Event<nframes_t>& ev = *i;
@@ -130,6 +143,12 @@ MidiPort::flush_buffers (nframes_t nframes, nframes_t offset)
}
}
void
MidiPort::transport_stopped ()
{
_resolve_in_process = true;
}
size_t
MidiPort::raw_buffer_size (nframes_t nframes) const
{

4
libs/ardour/midi_state_tracker.cc
View File

@@ -65,7 +65,7 @@ MidiStateTracker::track (const MidiBuffer::iterator &from, const MidiBuffer::ite
}
void
MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes_t time)
MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes64_t time)
{
for (int channel = 0; channel < 16; ++channel) {
for (int note = 0; note < 128; ++note) {
@@ -73,8 +73,8 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, nframes_t time)
uint8_t buffer[3] = { MIDI_CMD_NOTE_OFF | channel, note, 0 };
Evoral::MIDIEvent<MidiBuffer::TimeType> noteoff
(time, MIDI_CMD_NOTE_OFF, 3, buffer, false);
dst.push_back (noteoff);
_active_notes[channel * 128 + note]--;
}
}

25
libs/ardour/midi_track.cc
View File

@@ -465,23 +465,12 @@ MidiTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
write_out_of_band_data (bufs, start_frame, end_frame, nframes);
// Feed the data through the MidiStateTracker
bool did_loop;
_midi_state_tracker.track (mbuf.begin(), mbuf.end(), did_loop);
if (did_loop) {
/* add necessary note offs */
cerr << "DID LOOP, RESOLVE NOTES\n";
_midi_state_tracker.resolve_notes (mbuf, end_frame-start_frame - 1);
}
process_output_buffers (bufs, start_frame, end_frame, nframes,
(!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick);
(!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick);
}
_main_outs->flush (nframes);
_main_outs->flush (nframes, end_frame - start_frame - 1);
return 0;
}
@@ -502,16 +491,8 @@ MidiTrack::no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_fram
void
MidiTrack::handle_transport_stopped (bool abort, bool did_locate, bool flush_processors)
{
/* turn off any notes that are on */
MidiBuffer buf (1024); // XXX is this a reasonable size ?
_midi_state_tracker.resolve_notes (buf, 0); // time is zero because notes are immediate
for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
write_immediate_event ((*i).size(), (*i).buffer());
}
_main_outs->transport_stopped ();
Route::handle_transport_stopped (abort, did_locate, flush_processors);
}

2
libs/ardour/track.cc
View File

@@ -321,7 +321,7 @@ Track::no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
passthru (start_frame, end_frame, nframes, false);
}
_main_outs->flush (nframes);
_main_outs->flush (nframes, end_frame - start_frame - 1);
return 0;
}

2
libs/midi++2/jack_midiport.cc
View File

@@ -172,7 +172,7 @@ JACK_MidiPort::flush (void* jack_port_buffer)
non_process_thread_fifo.get_read_vector (&vec);
if (vec.len[0] + vec.len[1]) {
cerr << "Flush " << vec.len[0] + vec.len[1] << " events from non-process FIFO\n";
// cerr << "Flush " << vec.len[0] + vec.len[1] << " events from non-process FIFO\n";
}
if (vec.len[0]) {