smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Don't try to load separate diskstreams in 3.0 session files. Fix a few uses of Diskstream outside Track.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6946 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-04-21 21:29:15 +00:00
parent 061a85191c
commit 950ac6ef2b
7 changed files with 47 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gtk2_ardour/midi_time_axis.cc
View file

@ -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);