diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-04-21 21:29:15 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-04-21 21:29:15 +0000 |
| commit | 950ac6ef2b08b460adb16a1a3690077ecf55314c (patch) | |
| tree | 480fbd68d985cb610b3f577268f333a3947c3f25 /gtk2_ardour | |
| parent | 061a85191c301ac18f2e8ca59d43127a4499ba96 (diff) | |
Don't try to load separate diskstreams in 3.0 session files. Fix a few uses of Diskstream outside Track.
git-svn-id: svn://localhost/ardour2/branches/3.0@6946 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/midi_streamview.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 7992051ade..6fe2f01a90 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -395,11 +395,9 @@ MidiStreamView::setup_rec_box () rec_data_ready_connections.drop_connections (); - boost::shared_ptr<MidiDiskstream> mds = _trackview.midi_track()->midi_diskstream(); - sources.push_back (_trackview.midi_track()->write_source()); - mds->write_source()->ViewDataRangeReady.connect + _trackview.midi_track()->write_source()->ViewDataRangeReady.connect (rec_data_ready_connections, invalidator (*this), ui_bind (&MidiStreamView::rec_data_range_ready, this, _1, _2, boost::weak_ptr<Source>(_trackview.midi_track()->write_source())), diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 83567c42d9..9477e5c02e 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -195,13 +195,10 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, controls_vbox.pack_start(_midi_controls_box, false, false); - boost::shared_ptr<MidiDiskstream> diskstream = midi_track()->midi_diskstream(); - // restore channel selector settings - _channel_selector.set_channel_mode(diskstream->get_channel_mode(), - diskstream->get_channel_mask()); + _channel_selector.set_channel_mode(midi_track()->get_channel_mode(), midi_track()->get_channel_mask()); _channel_selector.mode_changed.connect( - sigc::mem_fun(*midi_track()->midi_diskstream(), &MidiDiskstream::set_channel_mode)); + sigc::mem_fun(*midi_track(), &MidiTrack::set_channel_mode)); _channel_selector.mode_changed.connect( sigc::mem_fun(*this, &MidiTimeAxisView::set_channel_mode)); @@ -782,8 +779,7 @@ void MidiTimeAxisView::show_all_automation () { if (midi_track()) { - const set<Evoral::Parameter> params = midi_track()->midi_diskstream()-> - midi_playlist()->contained_automation(); + const set<Evoral::Parameter> params = midi_track()->midi_playlist()->contained_automation(); for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) { create_automation_child(*i, true); @@ -797,8 +793,7 @@ void MidiTimeAxisView::show_existing_automation () { if (midi_track()) { - const set<Evoral::Parameter> params = midi_track()->midi_diskstream()-> - midi_playlist()->contained_automation(); + const set<Evoral::Parameter> params = midi_track()->midi_playlist()->contained_automation(); for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) { create_automation_child(*i, true); |