: Diskstream(sess, name, flag)
, _playback_buf(0)
, _capture_buf(0)
- , _source_port(0)
, _note_mode(Sustained)
, _frames_written_to_ringbuffer(0)
, _frames_read_from_ringbuffer(0)
+ , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI))
{
in_set_state = true;
: Diskstream(sess, node)
, _playback_buf(0)
, _capture_buf(0)
- , _source_port(0)
, _note_mode(Sustained)
, _frames_written_to_ringbuffer(0)
, _frames_read_from_ringbuffer(0)
+ , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI))
{
in_set_state = true;
}
if (ni == 0) {
- _source_port = 0;
+ _source_port.reset ();
} else {
_source_port = _io->midi(0);
}
if ((playlist = boost::dynamic_pointer_cast<MidiPlaylist> (PlaylistFactory::create (
DataType::MIDI, _session, newname, hidden()))) != 0) {
- playlist->set_orig_diskstream_id (id());
return use_playlist (playlist);
} else {
newname = Playlist::bump_name (_playlist->name(), _session);
if ((playlist = boost::dynamic_pointer_cast<MidiPlaylist>(PlaylistFactory::create (midi_playlist(), newname))) != 0) {
- playlist->set_orig_diskstream_id (id());
return use_playlist (playlist);
} else {
return -1;
#endif
int
-MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool& need_butler)
+MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, framecnt_t& playback_distance)
{
- int ret = -1;
framecnt_t rec_offset = 0;
framecnt_t rec_nframes = 0;
bool nominally_recording;
return 0;
}
- if (_source_port == 0) {
+ boost::shared_ptr<MidiPort> sp = _source_port.lock ();
+
+ if (sp == 0) {
return 1;
}
if (nominally_recording || rec_nframes) {
// Pump entire port buffer into the ring buffer (FIXME: split cycles?)
- MidiBuffer& buf = _source_port->get_midi_buffer(nframes);
+ MidiBuffer& buf = sp->get_midi_buffer(nframes);
for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
const Evoral::MIDIEvent<MidiBuffer::TimeType> ev(*i, false);
assert(ev.buffer());
}
if (buf.size() != 0) {
- /* XXX this needs fixing - realtime new() call for
- every time we get MIDI data in a process callback!
- */
-
- /* Make a copy of this data and emit it for the GUI to see */
- boost::shared_ptr<MidiBuffer> copy (new MidiBuffer (buf.capacity ()));
- for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
- copy->push_back ((*i).time() + transport_frame, (*i).size(), (*i).buffer());
+ Glib::Mutex::Lock lm (_gui_feed_buffer_mutex, Glib::TRY_LOCK);
+
+ if (lm.locked ()) {
+ /* Copy this data into our GUI feed buffer and tell the GUI
+ that it can read it if it likes.
+ */
+ _gui_feed_buffer.clear ();
+
+ for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
+ /* This may fail if buf is larger than _gui_feed_buffer, but it's not really
+ the end of the world if it does.
+ */
+ _gui_feed_buffer.push_back ((*i).time() + transport_frame, (*i).size(), (*i).buffer());
+ }
}
- DataRecorded (copy, _write_source); /* EMIT SIGNAL */
+ DataRecorded (_write_source); /* EMIT SIGNAL */
}
} else {
}
- ret = 0;
-
- if (commit (nframes)) {
- need_butler = true;
- }
-
- return ret;
+ return 0;
}
bool
-MidiDiskstream::commit (framecnt_t nframes)
+MidiDiskstream::commit (framecnt_t playback_distance)
{
bool need_butler = false;
uint32_t frames_read = g_atomic_int_get(&_frames_read_from_ringbuffer);
uint32_t frames_written = g_atomic_int_get(&_frames_written_to_ringbuffer);
- if ((frames_written - frames_read) + nframes < midi_readahead) {
+ if ((frames_written - frames_read) + playback_distance < midi_readahead) {
need_butler = true;
}
start = loop_start + ((start - loop_start) % loop_length);
//cerr << "to " << start << endl;
}
- //cerr << "start is " << start << " loopstart: " << loop_start << " loopend: " << loop_end << endl;
+ // cerr << "start is " << start << " loopstart: " << loop_start << " loopend: " << loop_end << endl;
}
while (dur) {
/* take any loop into account. we can't read past the end of the loop. */
- if (loc && (loop_end - start < dur)) {
+ if (loc && (loop_end - start <= dur)) {
this_read = loop_end - start;
- //cerr << "reloop true: thisread: " << this_read << " dur: " << dur << endl;
+ // cerr << "reloop true: thisread: " << this_read << " dur: " << dur << endl;
reloop = true;
} else {
reloop = false;
g_atomic_int_add(&_frames_written_to_ringbuffer, this_read);
- _read_data_count = _playlist->read_data_count();
-
if (reversed) {
// Swap note ons with note offs here. etc?
assert (!destructive());
- _write_data_count = 0;
-
total = _session.transport_frame() - _write_source->last_write_end();
if (total == 0 ||
Glib::Mutex::Lock lm (capture_info_lock);
if (capture_info.empty()) {
- return;
+ goto no_capture_stuff_to_do;
}
if (abort_capture) {
delete *ci;
}
- if (_playlist) {
- midi_playlist()->clear_note_trackers ();
- }
-
capture_info.clear ();
capture_start_frame = 0;
+
+ no_capture_stuff_to_do:
+
+ reset_tracker ();
}
void
last_recordable_frame = max_framepos;
was_recording = true;
}
+
+ if (!Config->get_seamless_loop()) {
+ reset_tracker ();
+ }
}
void
g_atomic_int_set (&_record_enabled, 1);
- if (_source_port && Config->get_monitoring_model() == HardwareMonitoring) {
- _source_port->request_monitor_input (!(_session.config.get_auto_input() && rolling));
+ boost::shared_ptr<MidiPort> sp = _source_port.lock ();
+
+ if (sp && Config->get_monitoring_model() == HardwareMonitoring) {
+ sp->request_jack_monitors_input (!(_session.config.get_auto_input() && rolling));
}
RecordEnableChanged (); /* EMIT SIGNAL */
}
void
-MidiDiskstream::monitor_input (bool yn)
+MidiDiskstream::ensure_jack_monitors_input (bool yn)
{
- if (_source_port)
- _source_port->ensure_monitor_input (yn);
+ boost::shared_ptr<MidiPort> sp = _source_port.lock ();
+
+ if (sp) {
+ sp->ensure_jack_monitors_input (yn);
+ }
}
void
float
MidiDiskstream::playback_buffer_load () const
{
- return (float) ((double) _playback_buf->read_space()/
- (double) _playback_buf->capacity());
+ /* For MIDI it's not trivial to differentiate the following two cases:
+
+ 1. The playback buffer is empty because the system has run out of time to fill it.
+ 2. The playback buffer is empty because there is no more data on the playlist.
+
+ If we use a simple buffer load computation, we will report that the MIDI diskstream
+ cannot keep up when #2 happens, when in fact it can. Since MIDI data rates
+ are so low compared to audio, just give a pretend answer here.
+ */
+
+ return 1;
}
float
MidiDiskstream::capture_buffer_load () const
{
- return (float) ((double) _capture_buf->write_space()/
- (double) _capture_buf->capacity());
+ /* We don't report playback buffer load, so don't report capture load either */
+
+ return 1;
}
int
return 0;
}
-/** Writes playback events in the given range to \a dst, translating time stamps
- * so that an event at \a start has time = 0
+/** Writes playback events from playback_sample for nframes to dst, translating time stamps
+ * so that an event at playback_sample has time = 0
*/
void
-MidiDiskstream::get_playback (MidiBuffer& dst, framepos_t start, framepos_t end)
+MidiDiskstream::get_playback (MidiBuffer& dst, framecnt_t nframes)
{
dst.clear();
assert(dst.size() == 0);
- // Reverse. ... We just don't do reverse, ok? Back off.
- if (end <= start) {
- return;
- }
-
- // Translate stamps to be relative to start
-
-
#ifndef NDEBUG
DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
"%1 MDS pre-read read %4..%5 from %2 write to %3\n", _name,
- _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr(), start, end));
+ _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr(), playback_sample, playback_sample + nframes));
// cerr << "================\n";
// _playback_buf->dump (cerr);
// cerr << "----------------\n";
- const size_t events_read = _playback_buf->read(dst, start, end);
+ const size_t events_read = _playback_buf->read (dst, playback_sample, playback_sample + nframes);
DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
"%1 MDS events read %2 range %3 .. %4 rspace %5 wspace %6 r@%7 w@%8\n",
- _name, events_read, start, end,
+ _name, events_read, playback_sample, playback_sample + nframes,
_playback_buf->read_space(), _playback_buf->write_space(),
- _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr()));
+ _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr()));
#else
- _playback_buf->read(dst, start, end);
+ _playback_buf->read (dst, playback_sample, playback_sample + nframes);
#endif
- gint32 frames_read = end - start;
- g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read);
+ g_atomic_int_add (&_frames_read_from_ringbuffer, nframes);
}
bool
return true;
}
+boost::shared_ptr<MidiBuffer>
+MidiDiskstream::get_gui_feed_buffer () const
+{
+ boost::shared_ptr<MidiBuffer> b (new MidiBuffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI)));
+
+ Glib::Mutex::Lock lm (_gui_feed_buffer_mutex);
+ b->copy (_gui_feed_buffer);
+ return b;
+}
+
+void
+MidiDiskstream::reset_tracker ()
+{
+ _playback_buf->reset_tracker ();
+
+ boost::shared_ptr<MidiPlaylist> mp (midi_playlist());
+
+ if (mp) {
+ mp->clear_note_trackers ();
+ }
+}
projects / ardour.git / blobdiff