diff options
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index bb319511b7..a235375ed1 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -194,9 +194,6 @@ Session::first_stage_init (string fullpath, string snapshot_name) xfade_model = ShortCrossfade; destructive_index = 0; - /* allocate conversion buffers */ - _conversion_buffers[ButlerContext] = new char[AudioDiskstream::disk_io_frames() * 4]; - _conversion_buffers[TransportContext] = new char[AudioDiskstream::disk_io_frames() * 4]; AudioDiskstream::allocate_working_buffers(); /* default short fade = 15ms */ @@ -628,15 +625,16 @@ Session::load_diskstreams (const XMLNode& node) clist = node.children(); for (citer = clist.begin(); citer != clist.end(); ++citer) { - Diskstream* dstream = NULL; + Diskstream* dstream = 0; try { - if ((*citer)->name() == "AudioDiskstream") { + /* diskstreams added automatically by DiskstreamCreated handler */ + if ((*citer)->name() == "AudioDiskstream" || (*citer)->name() == "DiskStream") { dstream = new AudioDiskstream (*this, **citer); - /* added automatically by DiskstreamCreated handler */ - } else { - assert((*citer)->name() == "MidiDiskstream"); + } else if ((*citer)->name() == "MidiDiskstream") { dstream = new MidiDiskstream (*this, **citer); + } else { + error << _("Session: unknown diskstream type in XML") << endmsg; } } |