extensive changes to PresentationInfo API

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

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 69d10c44e0cfe056d76188d1f02da8a8e961e50a..6402d9057c437e02cfd6712371cb26e49e391457 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -44,10 +44,12 @@
 #include "ardour/midi_port.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_track.h"
+#include "ardour/monitor_control.h"
 #include "ardour/parameter_types.h"
 #include "ardour/port.h"
 #include "ardour/processor.h"
 #include "ardour/profile.h"
+#include "ardour/route_group_specialized.h"
 #include "ardour/session.h"
 #include "ardour/session_playlists.h"
 #include "ardour/utils.h"
@@ -65,8 +67,8 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-MidiTrack::MidiTrack (Session& sess, string name, Route::Flag flag, TrackMode mode)
-       : Track (sess, name, flag, mode, DataType::MIDI)
+MidiTrack::MidiTrack (Session& sess, string name, TrackMode mode)
+       : Track (sess, name, PresentationInfo::MidiTrack, mode, DataType::MIDI)
        , _immediate_events(1024) // FIXME: size?
        , _step_edit_ring_buffer(64) // FIXME: size?
        , _note_mode(Sustained)
@@ -102,24 +104,24 @@ MidiTrack::create_diskstream ()
 }
 
 
-void
-MidiTrack::set_record_enabled (bool yn, void *src)
+bool
+MidiTrack::can_be_record_safe ()
 {
        if (_step_editing) {
-               return;
+               return false;
        }
 
-       Track::set_record_enabled (yn, src);
+       return Track::can_be_record_safe ();
 }
 
-void
-MidiTrack::set_record_safe (bool yn, void *src)
+bool
+MidiTrack::can_be_record_enabled ()
 {
-       if (_step_editing) { /* REQUIRES REVIEW */
-               return;
+       if (_step_editing) {
+               return false;
        }
 
-       Track::set_record_safe (yn, src);
+       return Track::can_be_record_enabled ();
 }
 
 void
@@ -160,7 +162,7 @@ MidiTrack::midi_diskstream() const
 int
 MidiTrack::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        /* This must happen before Track::set_state(), as there will be a buffer
           fill during that call, and we must fill buffers using the correct
@@ -271,8 +273,8 @@ void
 MidiTrack::set_state_part_two ()
 {
        XMLNode* fnode;
-       XMLProperty* prop;
-       LocaleGuard lg (X_("C"));
+       XMLProperty const * prop;
+       LocaleGuard lg;
 
        /* This is called after all session state has been restored but before
           have been made ports and connections are established.
@@ -371,7 +373,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
 
        if (!_active) {
                silence (nframes);
-               if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
+               if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) {
                        _meter->reset();
                }
                return 0;
@@ -411,7 +413,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
        /* filter captured data before meter sees it */
        _capture_filter.filter (bufs);
 
-       if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
+       if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) {
                _meter->run (bufs, start_frame, end_frame, nframes, true);
        }
 
@@ -725,15 +727,7 @@ MidiTrack::set_parameter_automation_state (Evoral::Parameter param, AutoState st
 }
 
 void
-MidiTrack::MidiControl::set_value (double val, PBD::Controllable::GroupControlDisposition /* group_override */)
-{
-       if (writable()) {
-               set_value_unchecked (val);
-       }
-}
-
-void
-MidiTrack::MidiControl::set_value_unchecked(double val)
+MidiTrack::MidiControl::actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override)
 {
        const Evoral::Parameter &parameter = _list ? _list->parameter() : Control::parameter();
        const Evoral::ParameterDescriptor &desc = EventTypeMap::instance().descriptor(parameter);
@@ -790,7 +784,7 @@ MidiTrack::MidiControl::set_value_unchecked(double val)
                _route->write_immediate_event(size,  ev);
        }
 
-       AutomationControl::set_value(val, Controllable::NoGroup);
+       AutomationControl::actually_set_value(val, group_override);
 }
 
 void
@@ -926,7 +920,7 @@ MidiTrack::act_on_mute ()
                return;
        }
 
-       if (muted() || _mute_master->muted_by_others_at(MuteMaster::AllPoints)) {
+       if (muted() || _mute_master->muted_by_others_soloing_at (MuteMaster::AllPoints)) {
                /* only send messages for channels we are using */
 
                uint16_t mask = _playback_filter.get_channel_mask();
@@ -950,30 +944,27 @@ MidiTrack::act_on_mute ()
 }
 
 void
-MidiTrack::set_monitoring (MonitorChoice mc)
+MidiTrack::monitoring_changed (bool self, Controllable::GroupControlDisposition gcd)
 {
-       if (mc != _monitoring) {
+       Track::monitoring_changed (self, gcd);
 
-               Track::set_monitoring (mc);
-
-               /* monitoring state changed, so flush out any on notes at the
-                * port level.
-                */
+       /* monitoring state changed, so flush out any on notes at the
+        * port level.
+        */
 
-               PortSet& ports (_output->ports());
+       PortSet& ports (_output->ports());
 
-               for (PortSet::iterator p = ports.begin(); p != ports.end(); ++p) {
-                       boost::shared_ptr<MidiPort> mp = boost::dynamic_pointer_cast<MidiPort> (*p);
-                       if (mp) {
-                               mp->require_resolve ();
-                       }
+       for (PortSet::iterator p = ports.begin(); p != ports.end(); ++p) {
+               boost::shared_ptr<MidiPort> mp = boost::dynamic_pointer_cast<MidiPort> (*p);
+               if (mp) {
+                       mp->require_resolve ();
                }
+       }
 
-               boost::shared_ptr<MidiDiskstream> md (midi_diskstream());
+       boost::shared_ptr<MidiDiskstream> md (midi_diskstream());
 
-               if (md) {
-                       md->reset_tracker ();
-               }
+       if (md) {
+               md->reset_tracker ();
        }
 }
 
@@ -986,4 +977,3 @@ MidiTrack::monitoring_state () const
        }
        return ms;
 }
-