diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-21 12:34:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-21 12:34:29 +0000 |
| commit | 56da993d83cc2e27cd4575becdefcefecf926f16 (patch) | |
| tree | 649a124afea0dc6757cd4cec6e284cb491d19b02 /libs/ardour/midi_track.cc | |
| parent | 96dcffcb222bc920cef9bfbaffb0548138352d65 (diff) | |
save&restore for track monitor state
git-svn-id: svn://localhost/ardour2/branches/3.0@10263 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_track.cc')
| -rw-r--r-- | libs/ardour/midi_track.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index fe2dc74b72..fb323e12dc 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -145,8 +145,10 @@ MidiTrack::_set_state (const XMLNode& node, int version, bool call_base) const XMLProperty *prop; XMLNodeConstIterator iter; - if (Route::_set_state (node, version, call_base)) { - return -1; + if (call_base) { + if (Track::_set_state (node, version, call_base)) { + return -1; + } } // No destructive MIDI tracks (yet?) @@ -209,7 +211,7 @@ MidiTrack::_set_state (const XMLNode& node, int version, bool call_base) XMLNode& MidiTrack::state(bool full_state) { - XMLNode& root (Route::state(full_state)); + XMLNode& root (Track::state(full_state)); XMLNode* freeze_node; char buf[64]; @@ -355,7 +357,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame _input->process_input (_meter, start_frame, end_frame, nframes); } - if (diskstream->record_enabled() && !can_record && !_session.config.get_auto_input()) { + if (should_monitor_input ()) { /* not actually recording, but we want to hear the input material anyway, at least potentially (depending on monitoring options) |