Remove debug code.

[ardour.git] / libs / ardour / midi_source.cc

diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 4c7abd22d8004b352e1509353a32d94f1d214f82..48d9cdf877b68142710c6bf02c9eb94aa5eeaa83 100644 (file)
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -34,19 +34,18 @@
 #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;
@@ -55,8 +54,6 @@ PBD::Signal1<void,MidiSource*> MidiSource::MidiSourceCreated;
 
 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)
@@ -67,17 +64,12 @@ MidiSource::MidiSource (Session& s, string name, Source::Flag flags)
 
 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)
 {
-       _read_data_count = 0;
-       _write_data_count = 0;
-
        if (set_state (node, Stateful::loading_state_version)) {
                throw failed_constructor();
        }
@@ -183,7 +175,7 @@ MidiSource::length (framepos_t pos) const
 }
 
 void
-MidiSource::update_length (framepos_t /*pos*/, framecnt_t /*cnt*/)
+MidiSource::update_length (framecnt_t)
 {
        // You're not the boss of me!
 }
@@ -206,8 +198,8 @@ MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_sta
 
        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;
@@ -217,6 +209,7 @@ MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_sta
                        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;
                                }
                        }
@@ -248,6 +241,8 @@ MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_sta
                                        }
                                }
                        } else {
+                                DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("%1: reached end with event @ %2 vs. %3\n",
+                                                                                  _name, time_frames, start+cnt));
                                break;
                        }
                }
@@ -265,8 +260,15 @@ framecnt_t
 MidiSource::midi_write (MidiRingBuffer<framepos_t>& source, framepos_t source_start, framecnt_t duration)
 {
        Glib::Mutex::Lock lm (_lock);
+
        const framecnt_t ret = write_unlocked (source, source_start, duration);
-       _last_write_end += duration;
+
+       if (duration == max_framecnt) {
+               _last_read_end = 0;
+       } else {
+               _last_write_end += duration;
+       }
+
        return ret;
 }
 
@@ -297,6 +299,8 @@ MidiSource::mark_write_starting_now ()
 
        set_timeline_position (_session.transport_frame ());
        _last_write_end = _session.transport_frame ();
+       cerr << name() << " last write set to " << _last_write_end << endl;
+
 }
 
 void
@@ -307,31 +311,42 @@ MidiSource::mark_streaming_write_started ()
 }
 
 void
-MidiSource::mark_streaming_write_completed ()
+MidiSource::mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption option, Evoral::MusicalTime end)
 {
        if (_model) {
-               _model->end_write(false);
+               _model->end_write (option, end);
        }
 
        _writing = false;
 }
 
+void
+MidiSource::mark_streaming_write_completed ()
+{
+       mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::DeleteStuckNotes);
+}
+
 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, '-');
+                       /* XXX build path safely */
+                       newpath = _session.session_directory().midi_path().to_string() +"/"+ 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,
@@ -382,7 +397,7 @@ MidiSource::session_saved()
                   try to update it.
                */
 
-               boost::shared_ptr<MidiModel> mm = _model ;
+               boost::shared_ptr<MidiModel> mm = _model;
                _model.reset ();
 
                /* flush model contents to disk