#include <iomanip>
#include <algorithm>
-#include <pbd/xml++.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/basename.h>
-
-#include <ardour/audioengine.h>
-#include <ardour/midi_model.h>
-#include <ardour/midi_ring_buffer.h>
-#include <ardour/midi_source.h>
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/source_factory.h>
-#include <ardour/tempo.h>
+#include "pbd/xml++.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/basename.h"
+
+#include "ardour/audioengine.h"
+#include "ardour/midi_model.h"
+#include "ardour/midi_ring_buffer.h"
+#include "ardour/midi_state_tracker.h"
+#include "ardour/midi_source.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/source_factory.h"
+#include "ardour/tempo.h"
#include "i18n.h"
sigc::signal<void,MidiSource *> MidiSource::MidiSourceCreated;
-MidiSource::MidiSource (Session& s, string name)
- : Source (s, name, DataType::MIDI)
- , _timeline_position(0)
+MidiSource::MidiSource (Session& s, string name, Source::Flag flags)
+ : Source (s, DataType::MIDI, name, flags)
, _read_data_count(0)
, _write_data_count(0)
- , _converter(s, _timeline_position)
, _writing (false)
+ , _length_beats(0.0)
, _last_read_end(0)
+ , _last_write_end(0)
{
}
-MidiSource::MidiSource (Session& s, const XMLNode& node)
+MidiSource::MidiSource (Session& s, const XMLNode& node)
: Source (s, node)
- , _timeline_position(0)
, _read_data_count(0)
, _write_data_count(0)
- , _converter(s, _timeline_position)
, _writing (false)
+ , _length_beats(0.0)
, _last_read_end(0)
+ , _last_write_end(0)
{
_read_data_count = 0;
_write_data_count = 0;
- if (set_state (node)) {
+ if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor();
}
}
}
int
-MidiSource::set_state (const XMLNode& node)
+MidiSource::set_state (const XMLNode& node, int version)
{
const XMLProperty* prop;
- Source::set_state (node);
-
if ((prop = node.property ("captured-for")) != 0) {
_captured_for = prop->value();
}
return 0;
}
-nframes_t
-MidiSource::midi_read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t cnt,
- nframes_t stamp_offset, nframes_t negative_stamp_offset) const
+sframes_t
+MidiSource::length (sframes_t pos) const
{
+ BeatsFramesConverter converter(_session, pos);
+ return converter.to(_length_beats);
+}
+
+void
+MidiSource::update_length (sframes_t /*pos*/, sframes_t /*cnt*/)
+{
+ // You're not the boss of me!
+}
+void
+MidiSource::invalidate ()
+{
+ _model_iter.invalidate();
+}
+
+nframes_t
+MidiSource::midi_read (MidiRingBuffer<nframes_t>& dst, sframes_t source_start,
+ sframes_t start, nframes_t cnt,
+ sframes_t stamp_offset, sframes_t negative_stamp_offset,
+ MidiStateTracker* tracker) const
+{
Glib::Mutex::Lock lm (_lock);
+
+ BeatsFramesConverter converter(_session, source_start);
+
if (_model) {
-#define BEATS_TO_FRAMES(t) (_converter.to(t) + stamp_offset - negative_stamp_offset)
+#define BEATS_TO_FRAMES(t) (converter.to(t) + stamp_offset - negative_stamp_offset)
Evoral::Sequence<double>::const_iterator& i = _model_iter;
-
- if (_last_read_end == 0 || start != _last_read_end) {
- cerr << "MidiSource::midi_read seeking to frame " << start << endl;
+
+ if (_last_read_end == 0 || start != _last_read_end || !i.valid()) {
for (i = _model->begin(); i != _model->end(); ++i) {
if (BEATS_TO_FRAMES(i->time()) >= start) {
break;
}
}
}
-
+
_last_read_end = start + cnt;
for (; i != _model->end(); ++i) {
- const nframes_t time_frames = BEATS_TO_FRAMES(i->time());
- if (time_frames < start + cnt) {
+ const sframes_t time_frames = BEATS_TO_FRAMES(i->time());
+ if (time_frames < source_start + start + cnt) {
dst.write(time_frames, i->event_type(), i->size(), i->buffer());
+ if (tracker) {
+ Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(Evoral::MIDIEvent<Evoral::MusicalTime>*) (&(*i)));
+ if (ev.is_note_on()) {
+ tracker->add (ev.note(), ev.channel());
+ } else if (ev.is_note_off()) {
+ tracker->remove (ev.note(), ev.channel());
+ }
+ }
} else {
break;
}
}
return cnt;
} else {
- return read_unlocked (dst, start, cnt, stamp_offset, negative_stamp_offset);
+ return read_unlocked (dst, source_start, start, cnt, stamp_offset, negative_stamp_offset, tracker);
}
}
nframes_t
-MidiSource::midi_write (MidiRingBuffer<nframes_t>& dst, nframes_t cnt)
+MidiSource::midi_write (MidiRingBuffer<nframes_t>& source, sframes_t source_start, nframes_t duration)
{
Glib::Mutex::Lock lm (_lock);
- return write_unlocked (dst, cnt);
+ const nframes_t ret = write_unlocked (source, source_start, duration);
+ _last_write_end += duration;
+ return ret;
}
bool
struct stat stat_file;
int e1 = stat (path.c_str(), &stat_file);
-
- return !e1;
-}
-void
-MidiSource::set_timeline_position (nframes_t when)
-{
- _timeline_position = when;
- _converter.set_origin(when);
+ return !e1;
}
void
-MidiSource::mark_streaming_midi_write_started (NoteMode mode, nframes_t start_frame)
+MidiSource::mark_streaming_midi_write_started (NoteMode mode, sframes_t start_frame)
{
- set_timeline_position(start_frame); // why do I have a feeling this can break somehow...
+ set_timeline_position(start_frame);
if (_model) {
_model->set_note_mode(mode);
_model->start_write();
}
-
+
+ _last_write_end = start_frame;
_writing = true;
}
void
MidiSource::mark_streaming_write_started ()
{
+ sframes_t start_frame = _session.transport_frame();
+
if (_model) {
_model->start_write();
}
+ _last_write_end = start_frame;
_writing = true;
}
MidiSource::mark_streaming_write_completed ()
{
if (_model) {
- _model->end_write(false); // FIXME: param?
+ _model->end_write(false);
}
_writing = false;
stringstream ss(basename.substr(last_dash+1));
unsigned write_count = 0;
ss >> write_count;
- cerr << "WRITE COUNT: " << write_count << endl;
+ // cerr << "WRITE COUNT: " << write_count << endl;
++write_count; // start at 1
ss.clear();
ss << basename.substr(0, last_dash) << "-" << write_count;
string newpath = _session.session_directory().midi_path().to_string() +"/"+ newname + ".mid";
boost::shared_ptr<MidiSource> newsrc = boost::dynamic_pointer_cast<MidiSource>(
- SourceFactory::createWritable(DataType::MIDI, _session, newpath, 1, 0, true));
+ SourceFactory::createWritable(DataType::MIDI, _session,
+ newpath, true, false, _session.frame_rate()));
newsrc->set_timeline_position(_timeline_position);
_model->write_to(newsrc);
// cyclic dependency here, ugly :(
newsrc->set_model(_model);
_model->set_midi_source(newsrc.get());
-
+
newsrc->flush_midi();
Switched.emit(newsrc);
projects / ardour.git / blobdiff