#include <algorithm>
#include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
#include "pbd/xml++.h"
#include "pbd/pthread_utils.h"
#include "pbd/basename.h"
-#include "ardour/audioengine.h"
#include "ardour/debug.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"
+namespace ARDOUR { template <typename T> class MidiRingBuffer; }
+
using namespace std;
using namespace ARDOUR;
using namespace PBD;
MidiSource::MidiSource (Session& s, string name, Source::Flag flags)
: Source(s, DataType::MIDI, name, flags)
- , _read_data_count(0)
- , _write_data_count(0)
, _writing(false)
, _model_iter_valid(false)
, _length_beats(0.0)
, _last_read_end(0)
- , _last_write_end(0)
+ , _capture_length(0)
+ , _capture_loop_length(0)
{
}
MidiSource::MidiSource (Session& s, const XMLNode& node)
: Source(s, node)
- , _read_data_count(0)
- , _write_data_count(0)
, _writing(false)
, _model_iter_valid(false)
, _length_beats(0.0)
, _last_read_end(0)
- , _last_write_end(0)
+ , _capture_length(0)
+ , _capture_loop_length(0)
{
- _read_data_count = 0;
- _write_data_count = 0;
-
if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor();
}
}
void
-MidiSource::update_length (framepos_t /*pos*/, framecnt_t /*cnt*/)
+MidiSource::update_length (framecnt_t)
{
// You're not the boss of me!
}
MidiStateTracker* tracker,
std::set<Evoral::Parameter> const & filtered) const
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
BeatsFramesConverter converter(_session.tempo_map(), source_start);
- DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("MidiSource::midi-read() sstart %1 start %2 cnt %3 tracker %4\n",
- source_start, start, cnt, tracker));
+ DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("MidiSource::midi-read() %5 sstart %1 start %2 cnt %3 tracker %4\n",
+ source_start, start, cnt, tracker, name()));
if (_model) {
Evoral::Sequence<double>::const_iterator& i = _model_iter;
DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 search for relevant iterator for %1 / %2\n", _name, source_start, start));
for (i = _model->begin(0, false, filtered); i != _model->end(); ++i) {
if (converter.to(i->time()) >= start) {
+ DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("***\tstop iterator search @ %1\n", i->time()));
break;
}
}
_name, time_frames + source_start, i->event_type(), i->size()));
if (tracker) {
- Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(Evoral::MIDIEvent<Evoral::MusicalTime>*) (&(*i)));
+ Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(reinterpret_cast<Evoral::MIDIEvent<Evoral::MusicalTime>*>
+ (const_cast<Evoral::Event<Evoral::MusicalTime>*> (&(*i)))));
if (ev.is_note_on()) {
DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 track note on %2 @ %3 velocity %4\n", _name, (int) ev.note(), time_frames, (int) ev.velocity()));
tracker->add (ev.note(), ev.channel());
}
}
} else {
+ DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("%1: reached end with event @ %2 vs. %3\n",
+ _name, time_frames, start+cnt));
break;
}
}
}
}
-/** Write data from a MidiRingBuffer to this source.
- * @param source Source to read from.
- * @param source_start This source's start position in session frames.
- */
framecnt_t
-MidiSource::midi_write (MidiRingBuffer<framepos_t>& source, framepos_t source_start, framecnt_t duration)
+MidiSource::midi_write (MidiRingBuffer<framepos_t>& source,
+ framepos_t source_start,
+ framecnt_t cnt)
{
- Glib::Mutex::Lock lm (_lock);
- cerr << "MidiSource calling write unlocked\n";
- const framecnt_t ret = write_unlocked (source, source_start, duration);
+ Glib::Threads::Mutex::Lock lm (_lock);
- if (duration == max_framecnt) {
+ const framecnt_t ret = write_unlocked (source, source_start, cnt);
+
+ if (cnt == max_framecnt) {
_last_read_end = 0;
} else {
- _last_write_end += duration;
+ _capture_length += cnt;
}
- cerr << name() << " last write end now @ " << _last_write_end << endl;
return ret;
}
}
void
-MidiSource::mark_write_starting_now ()
+MidiSource::mark_write_starting_now (framecnt_t position,
+ framecnt_t capture_length,
+ framecnt_t loop_length)
{
/* I'm not sure if this is the best way to approach this, but
- _last_write_end needs to be set up with the transport frame
+ _capture_length needs to be set up with the transport frame
when a record actually starts, as it is used by
SMFSource::write_unlocked to decide whether incoming notes
are within the correct time range.
because it is not RT-safe.
*/
- set_timeline_position (_session.transport_frame ());
- _last_write_end = _session.transport_frame ();
- cerr << name() << " last write set to " << _last_write_end << endl;
+ set_timeline_position(position);
+ _capture_length = capture_length;
+ _capture_loop_length = loop_length;
+ BeatsFramesConverter converter(_session.tempo_map(), position);
+ _length_beats = converter.from(capture_length);
}
void
}
boost::shared_ptr<MidiSource>
-MidiSource::clone (Evoral::MusicalTime begin, Evoral::MusicalTime end)
+MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::MusicalTime end)
{
string newname = PBD::basename_nosuffix(_name.val());
string newpath;
- /* get a new name for the MIDI file we're going to write to
- */
-
- do {
+ if (path.empty()) {
- newname = bump_name_once (newname, '-');
- /* XXX build path safely */
- newpath = _session.session_directory().midi_path().to_string() +"/"+ newname + ".mid";
-
- } while (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS));
+ /* get a new name for the MIDI file we're going to write to
+ */
+
+ do {
+ newname = bump_name_once (newname, '-');
+ newpath = Glib::build_filename (_session.session_directory().midi_path(), newname + ".mid");
+
+ } while (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS));
+ } else {
+ /* caller must check for pre-existing file */
+ newpath = path;
+ }
boost::shared_ptr<MidiSource> newsrc = boost::dynamic_pointer_cast<MidiSource>(
SourceFactory::createWritable(DataType::MIDI, _session,
- newpath, string(), false, _session.frame_rate()));
+ newpath, false, _session.frame_rate()));
newsrc->set_timeline_position(_timeline_position);
newsrc->copy_interpolation_from (this);
*/
if (_model && _model->edited()) {
-
+
// if the model is edited, write its contents into
// the current source file (overwiting previous contents.
try to update it.
*/
- boost::shared_ptr<MidiModel> mm = _model ;
+ boost::shared_ptr<MidiModel> mm = _model;
_model.reset ();
/* flush model contents to disk
projects / ardour.git / blobdiff