diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-04-03 23:36:12 +0200 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
| commit | 35c7274cc96a04f166df78249e66ae4a32a53a66 (patch) | |
| tree | 99794daed4a289bf9164d0864d46f4773397fbaa /libs/ardour/midi_track.cc | |
| parent | d16ae875be9d113c3cb0ec9e8311f3bb5dab9bfa (diff) | |
remove Diskstream from Track and derivatives; get ardour to actually startup
Diffstat (limited to 'libs/ardour/midi_track.cc')
| -rw-r--r-- | libs/ardour/midi_track.cc | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 6cbf700f03..be85bc1d49 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -42,7 +42,6 @@ #include "ardour/disk_writer.h" #include "ardour/event_type_map.h" #include "ardour/meter.h" -#include "ardour/midi_diskstream.h" #include "ardour/midi_playlist.h" #include "ardour/midi_port.h" #include "ardour/midi_region.h" @@ -102,17 +101,6 @@ MidiTrack::init () return 0; } -boost::shared_ptr<Diskstream> -MidiTrack::create_diskstream () -{ - MidiDiskstream::Flag dflags = MidiDiskstream::Flag (MidiDiskstream::Recordable); - - assert(_mode != Destructive); - - return boost::shared_ptr<Diskstream> (new MidiDiskstream (_session, name(), dflags)); -} - - bool MidiTrack::can_be_record_safe () { @@ -348,7 +336,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame if (!_active) { silence (nframes); - if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) { + if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _disk_writer->record_enabled())) { _meter->reset(); } return 0; @@ -364,7 +352,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_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) { + if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _disk_writer->record_enabled())) { _meter->run (bufs, start_frame, end_frame, 1.0 /*speed()*/, nframes, true); } @@ -769,12 +757,6 @@ MidiTrack::midi_playlist () return boost::dynamic_pointer_cast<MidiPlaylist> (_playlists[DataType::MIDI]); } -void -MidiTrack::diskstream_data_recorded (boost::weak_ptr<MidiSource> src) -{ - DataRecorded (src); /* EMIT SIGNAL */ -} - bool MidiTrack::input_active () const { @@ -816,12 +798,6 @@ MidiTrack::track_input_active (IOChange change, void* /* src */) } } -boost::shared_ptr<Diskstream> -MidiTrack::diskstream_factory (XMLNode const & node) -{ - return boost::shared_ptr<Diskstream> (new MidiDiskstream (_session, node)); -} - boost::shared_ptr<MidiBuffer> MidiTrack::get_gui_feed_buffer () const { |