fix bug in path_expand() when passed an empty string

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

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index fbd1f54213c349bd2e16eb89e076738e2912c8e9..452e3038bd2825fe365300b226e4da82541b9312 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -25,6 +25,7 @@
 
 #include "ardour/amp.h"
 #include "ardour/buffer_set.h"
+#include "ardour/debug.h"
 #include "ardour/delivery.h"
 #include "ardour/io_processor.h"
 #include "ardour/meter.h"
@@ -83,6 +84,16 @@ MidiTrack::use_new_diskstream ()
        set_diskstream (ds);
 }
 
+void
+MidiTrack::set_record_enabled (bool yn, void *src)
+{
+        if (_step_editing) {
+                return;
+        }
+
+        Track::set_record_enabled (yn, src);
+}
+
 void
 MidiTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
 {
@@ -94,6 +105,10 @@ MidiTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
        _diskstream->set_record_enabled (false);
        //_diskstream->monitor_input (false);
 
+       _diskstream_data_recorded_connection.disconnect ();
+       boost::shared_ptr<MidiDiskstream> mds = boost::dynamic_pointer_cast<MidiDiskstream> (ds);
+       mds->DataRecorded.connect_same_thread (_diskstream_data_recorded_connection, boost::bind (&MidiTrack::diskstream_data_recorded, this, _1, _2));
+
        DiskstreamChanged (); /* EMIT SIGNAL */
 }
 
@@ -347,6 +362,12 @@ MidiTrack::roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame
                BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers());
                MidiBuffer& mbuf (bufs.get_midi (0));
 
+               /* we are a MIDI track, so we always start the chain with a single-channel diskstream */
+               ChanCount c;
+               c.set_audio (0);
+               c.set_midi (1);
+               bufs.set_count (c);
+
                diskstream->get_playback (mbuf, start_frame, end_frame);
 
                /* append immediate messages to the first MIDI buffer (thus sending it to the first output port) */
@@ -358,18 +379,18 @@ MidiTrack::roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame
 
        }
 
-       _main_outs->flush (nframes, end_frame - start_frame - 1);
+       _main_outs->flush_buffers (nframes, end_frame - start_frame - 1);
 
        return 0;
 }
 
 int
-MidiTrack::no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
+MidiTrack::no_roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame,
                    bool state_changing, bool can_record, bool rec_monitors_input)
 {
        int ret = Track::no_roll (nframes, start_frame, end_frame, state_changing, can_record, rec_monitors_input);
 
-       if (ret == 0 && _diskstream->record_enabled() && _step_editing) {
+       if (ret == 0 && _step_editing) {
                push_midi_input_to_step_edit_ringbuffer (nframes);
        }
 
@@ -379,12 +400,9 @@ 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)
 {
-
-       _main_outs->transport_stopped ();
        Route::handle_transport_stopped (abort, did_locate, flush_processors);
 }
 
-
 void
 MidiTrack::push_midi_input_to_step_edit_ringbuffer (nframes_t nframes)
 {
@@ -400,20 +418,29 @@ MidiTrack::push_midi_input_to_step_edit_ringbuffer (nframes_t nframes)
 
                        const Evoral::MIDIEvent<nframes_t> ev(*e, false);
 
-                       /* we don't care about the time for this purpose */
-
-                       _step_edit_ring_buffer.write (0, ev.type(), ev.size(), ev.buffer());
+                        /* note on, since for step edit, note length is determined
+                           elsewhere 
+                        */
+                        
+                        if (ev.is_note_on()) {
+                                /* we don't care about the time for this purpose */
+                                _step_edit_ring_buffer.write (0, ev.type(), ev.size(), ev.buffer());
+                        }
                }
        }
 }
 
 void
-MidiTrack::write_out_of_band_data (BufferSet& bufs, sframes_t /*start*/, sframes_t /*end*/, nframes_t nframes)
+MidiTrack::write_out_of_band_data (BufferSet& bufs, framepos_t /*start*/, framepos_t /*end*/, nframes_t nframes)
 {
        // Append immediate events
        MidiBuffer& buf (bufs.get_midi (0));
-       _immediate_events.read (buf, 0, 0, nframes - 1); // all stamps = 0
-
+        if (_immediate_events.read_space()) {
+                DEBUG_TRACE (DEBUG::MidiIO, string_compose ("%1 has %2 of immediate events to deliver\n", 
+                                                            name(), _immediate_events.read_space()));
+        }
+       _immediate_events.read (buf, 0, 1, nframes-1); // all stamps = 0
+        
        // MIDI thru: send incoming data "through" output
        if (_midi_thru && _session.transport_speed() != 0.0f && _input->n_ports().n_midi()) {
                buf.merge_in_place (_input->midi(0)->get_midi_buffer(nframes));
@@ -421,7 +448,7 @@ MidiTrack::write_out_of_band_data (BufferSet& bufs, sframes_t /*start*/, sframes
 }
 
 int
-MidiTrack::export_stuff (BufferSet& /*bufs*/, nframes_t /*nframes*/, sframes_t /*end_frame*/)
+MidiTrack::export_stuff (BufferSet& /*bufs*/, nframes_t /*nframes*/, framepos_t /*end_frame*/)
 {
        return -1;
 }
@@ -474,6 +501,7 @@ MidiTrack::set_note_mode (NoteMode m)
 void
 MidiTrack::midi_panic()
 {
+        DEBUG_TRACE (DEBUG::MidiIO, string_compose ("%1 delivers panic data\n", name()));
        for (uint8_t channel = 0; channel <= 0xF; channel++) {
                uint8_t ev[3] = { MIDI_CMD_CONTROL | channel, MIDI_CTL_SUSTAIN, 0 };
                write_immediate_event(3, ev);
@@ -498,7 +526,7 @@ MidiTrack::write_immediate_event(size_t size, const uint8_t* buf)
 }
 
 void
-MidiTrack::MidiControl::set_value(float val)
+MidiTrack::MidiControl::set_value(double val)
 {
        bool valid = false;
        if (isinf(val)) {
@@ -558,7 +586,14 @@ MidiTrack::MidiControl::set_value(float val)
 void
 MidiTrack::set_step_editing (bool yn)
 {
-       _step_editing = yn;
+        if (_session.record_status() != Session::Disabled) {
+                return;
+        }
+
+        if (yn != _step_editing) {
+                _step_editing = yn;
+                StepEditStatusChange (yn);
+        }
 }
 
 void
@@ -574,7 +609,7 @@ MidiTrack::set_midi_thru (bool yn)
 }
 
 boost::shared_ptr<SMFSource>
-MidiTrack::write_source (uint32_t n)
+MidiTrack::write_source (uint32_t)
 {
        return midi_diskstream()->write_source ();
 }
@@ -602,3 +637,10 @@ MidiTrack::midi_playlist ()
 {
        return midi_diskstream()->midi_playlist ();
 }
+
+void
+MidiTrack::diskstream_data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_ptr<MidiSource> src)
+{
+       DataRecorded (buf, src); /* EMIT SIGNAL */
+}
+