rationalize destruction pathway (some more); tidy-ify some ImageFrame code

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

diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index 3ced46df9f69f37dfcaef7d788c0d76971e242c4..7bb995337f64bbf7225773e28bd1350b9c8a144f 100644 (file)
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -24,8 +24,6 @@
 
 #include <set>
 
-#include <sigc++/bind.h>
-#include <sigc++/class_slot.h>
 
 #include <glibmm/thread.h>
 
@@ -47,13 +45,14 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 
 /** Basic MidiRegion constructor (one channel) */
 MidiRegion::MidiRegion (boost::shared_ptr<MidiSource> src, nframes_t start, nframes_t length)
        : Region (src, start, length, PBD::basename_nosuffix(src->name()), DataType::MIDI, 0,  Region::Flag(Region::DefaultFlags|Region::External))
 {
        assert(_name.find("/") == string::npos);
-       midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source));
+       midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1));
 }
 
 /* Basic MidiRegion constructor (one channel) */
@@ -61,7 +60,7 @@ MidiRegion::MidiRegion (boost::shared_ptr<MidiSource> src, nframes_t start, nfra
        : Region (src, start, length, name, DataType::MIDI, layer, flags)
 {
        assert(_name.find("/") == string::npos);
-       midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source));
+       midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1));
 }
 
 /* Basic MidiRegion constructor (many channels) */
@@ -69,7 +68,7 @@ MidiRegion::MidiRegion (const SourceList& srcs, nframes_t start, nframes_t lengt
        : Region (srcs, start, length, name, DataType::MIDI, layer, flags)
 {
        assert(_name.find("/") == string::npos);
-       midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source));
+       midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1));
 }
 
 
@@ -78,14 +77,14 @@ MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, nframes_t off
        : Region (other, offset, length, name, layer, flags)
 {
        assert(_name.find("/") == string::npos);
-       midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source));
+       midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1));
 }
 
 MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other)
        : Region (other)
 {
        assert(_name.find("/") == string::npos);
-       midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source));
+       midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1));
 }
 
 MidiRegion::MidiRegion (boost::shared_ptr<MidiSource> src, const XMLNode& node)
@@ -95,7 +94,7 @@ MidiRegion::MidiRegion (boost::shared_ptr<MidiSource> src, const XMLNode& node)
                throw failed_constructor();
        }
 
-       midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source));
+       midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1));
        assert(_name.find("/") == string::npos);
        assert(_type == DataType::MIDI);
 }
@@ -107,7 +106,7 @@ MidiRegion::MidiRegion (const SourceList& srcs, const XMLNode& node)
                throw failed_constructor();
        }
 
-       midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegion::switch_source));
+       midi_source(0)->Switched.connect_same_thread (*this, boost::bind (&MidiRegion::switch_source, this, _1));
        assert(_name.find("/") == string::npos);
        assert(_type == DataType::MIDI);
 }
@@ -119,30 +118,31 @@ MidiRegion::~MidiRegion ()
 void
 MidiRegion::set_position_internal (nframes_t pos, bool allow_bbt_recompute)
 {
-       BeatsFramesConverter old_converter(_session, _position - _start);
+       BeatsFramesConverter old_converter(_session.tempo_map(), _position - _start);
        double length_beats = old_converter.from(_length);
 
        Region::set_position_internal(pos, allow_bbt_recompute);
 
-       BeatsFramesConverter new_converter(_session, pos - _start);
+       BeatsFramesConverter new_converter(_session.tempo_map(), pos - _start);
 
        set_length(new_converter.to(length_beats), 0);
 }
 
 nframes_t
-MidiRegion::read_at (MidiRingBuffer<nframes_t>& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
+MidiRegion::read_at (Evoral::EventSink<nframes_t>& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker) const
 {
-       return _read_at (_sources, out, position, dur, chan_n, mode);
+       return _read_at (_sources, out, position, dur, chan_n, mode, tracker);
 }
 
 nframes_t
 MidiRegion::master_read_at (MidiRingBuffer<nframes_t>& out, sframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
 {
-       return _read_at (_master_sources, out, position, dur, chan_n, mode);
+       return _read_at (_master_sources, out, position, dur, chan_n, mode); /* no tracker */
 }
 
 nframes_t
-MidiRegion::_read_at (const SourceList& /*srcs*/, MidiRingBuffer<nframes_t>& dst, nframes_t position, nframes_t dur, uint32_t chan_n, NoteMode mode) const
+MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink<nframes_t>& dst, sframes_t position, nframes_t dur, uint32_t chan_n, 
+                     NoteMode mode, MidiStateTracker* tracker) const
 {
        nframes_t internal_offset = 0;
        nframes_t src_offset      = 0;
@@ -152,6 +152,10 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, MidiRingBuffer<nframes_t>& dst
 
        assert(chan_n == 0);
 
+       if (muted()) {
+               return 0; /* read nothing */
+       }
+
        if (position < _position) {
                internal_offset = 0;
                src_offset = _position - position;
@@ -169,13 +173,6 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, MidiRingBuffer<nframes_t>& dst
                return 0; /* read nothing */
        }
 
-       // FIXME: non-opaque MIDI regions not yet supported
-       assert(opaque());
-
-       if (muted()) {
-               return 0; /* read nothing */
-       }
-
        _read_data_count = 0;
 
        boost::shared_ptr<MidiSource> src = midi_source(chan_n);
@@ -192,14 +189,13 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, MidiRingBuffer<nframes_t>& dst
                negative_output_buffer_position = _start;
        }
 
-#if 0
-       cerr << "\t\tsource read from " << _position << " - " << _start << " (" << _position - _start << ") "
-            << " start in source " << _start << " + " << internal_offset << " (" << _start + internal_offset << ") "
-            << " dur = " << to_read
-            << " offset = " << output_buffer_position
-            << " negoffset = " << negative_output_buffer_position
-            << endl;
-#endif
+       /*cerr << "MR read @ " << position << " * " << to_read
+               << " _position = " << _position
+           << " _start = " << _start
+           << " offset = " << output_buffer_position
+           << " negoffset = " << negative_output_buffer_position
+           << " intoffset = " << internal_offset
+           << endl;*/
 
        if (src->midi_read (
                        dst, // destination buffer
@@ -207,8 +203,9 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, MidiRingBuffer<nframes_t>& dst
                        _start + internal_offset, // where to start reading in the source
                        to_read, // read duration in frames
                        output_buffer_position, // the offset in the output buffer
-                       negative_output_buffer_position // amount to substract from note times
-               ) != to_read) {
+                       negative_output_buffer_position, // amount to substract from note times
+                       tracker
+                   ) != to_read) {
                return 0; /* "read nothing" */
        }