diff options
author | Carl Hetherington <carl@carlh.net> | 2011-03-01 02:04:42 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-03-01 02:04:42 +0000 |
commit | b741c14f3e12562df03813a192c11045d46d236c (patch) | |
tree | 7bcb7d7f4b29f77625be78a81f763ac9d9ca4039 /libs/ardour/midi_track.cc | |
parent | e47dd1a96aef5ff5eb175e39da73154e86425480 (diff) |
Don't create the MidiDiskstream twice (in both _set_state and set_state_part_two)
git-svn-id: svn://localhost/ardour2/branches/3.0@8997 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_track.cc')
-rw-r--r-- | libs/ardour/midi_track.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index cdd4633448..e80f7f6406 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -287,11 +287,8 @@ MidiTrack::set_state_part_two () } } - if ((fnode = find_named_node (*pending_state, X_("Diskstream"))) != 0) { - boost::shared_ptr<MidiDiskstream> ds (new MidiDiskstream (_session, *fnode)); - ds->do_refill_with_alloc (); - ds->set_block_size (_session.get_block_size ()); - set_diskstream (ds); + if (midi_diskstream ()) { + midi_diskstream()->set_block_size (_session.get_block_size ()); } return; |