X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_state.cc;h=92be2da9abaf9b2e6ef03cee20b28adcd3f32b31;hb=2b9dc7b380bb4e40171067f42b4010970869a57d;hp=1742feaab1755e878c8b7b4c3edc2349b2119fd9;hpb=c83389b8ec5fef9553a401e6123b7e55702af9e2;p=ardour.git diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 1742feaab1..92be2da9ab 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -57,13 +57,16 @@ #include "midi++/port.h" #include "pbd/boost_debug.h" +#include "pbd/controllable_descriptor.h" #include "pbd/enumwriter.h" #include "pbd/error.h" #include "pbd/pathscanner.h" #include "pbd/pthread_utils.h" #include "pbd/search_path.h" #include "pbd/stacktrace.h" +#include "pbd/convert.h" +#include "ardour/amp.h" #include "ardour/audio_diskstream.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" @@ -89,6 +92,7 @@ #include "ardour/midi_track.h" #include "ardour/named_selection.h" #include "ardour/processor.h" +#include "ardour/port.h" #include "ardour/region_factory.h" #include "ardour/route_group.h" #include "ardour/send.h" @@ -144,10 +148,8 @@ Session::first_stage_init (string fullpath, string snapshot_name) } if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS) && ::access (_path.c_str(), W_OK)) { - cerr << "Session non-writable based on " << _path << endl; _writable = false; } else { - cerr << "Session writable based on " << _path << endl; _writable = true; } @@ -164,11 +166,12 @@ Session::first_stage_init (string fullpath, string snapshot_name) _base_frame_rate = _current_frame_rate; _tempo_map = new TempoMap (_current_frame_rate); - _tempo_map->StateChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1)); + _tempo_map->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1)); _non_soloed_outs_muted = false; _listen_cnt = 0; + _solo_isolated_cnt = 0; g_atomic_int_set (&processing_prohibited, 0); _transport_speed = 0; _last_transport_speed = 0; @@ -177,13 +180,13 @@ Session::first_stage_init (string fullpath, string snapshot_name) transport_sub_state = 0; _transport_frame = 0; _requested_return_frame = -1; - end_location = new Location (0, 0, _("end"), Location::Flags ((Location::IsMark|Location::IsEnd))); - start_location = new Location (0, 0, _("start"), Location::Flags ((Location::IsMark|Location::IsStart))); + _session_range_location = 0; g_atomic_int_set (&_record_status, Disabled); loop_changing = false; play_loop = false; have_looped = false; _last_roll_location = 0; + _last_roll_or_reversal_location = 0; _last_record_location = 0; pending_locate_frame = 0; pending_locate_roll = false; @@ -205,14 +208,8 @@ Session::first_stage_init (string fullpath, string snapshot_name) session_send_mtc = false; g_atomic_int_set (&_playback_load, 100); g_atomic_int_set (&_capture_load, 100); - g_atomic_int_set (&_playback_load_min, 100); - g_atomic_int_set (&_capture_load_min, 100); _play_range = false; _exporting = false; - _exporting_realtime = false; - _gain_automation_buffer = 0; - _pan_automation_buffer = 0; - _npan_buffers = 0; pending_abort = false; destructive_index = 0; first_file_data_format_reset = true; @@ -270,10 +267,8 @@ Session::first_stage_init (string fullpath, string snapshot_name) /* These are all static "per-class" signals */ - RegionFactory::CheckNewRegion.connect_same_thread (*this, boost::bind (&Session::add_region, this, _1)); SourceFactory::SourceCreated.connect_same_thread (*this, boost::bind (&Session::add_source, this, _1)); PlaylistFactory::PlaylistCreated.connect_same_thread (*this, boost::bind (&Session::add_playlist, this, _1, _2)); - Processor::ProcessorCreated.connect_same_thread (*this, boost::bind (&Session::add_processor, this, _1)); AutomationList::AutomationListCreated.connect_same_thread (*this, boost::bind (&Session::add_automation_list, this, _1)); Controllable::Destroyed.connect_same_thread (*this, boost::bind (&Session::remove_controllable, this, _1)); IO::PortCountChanged.connect_same_thread (*this, boost::bind (&Session::ensure_buffers, this, _1)); @@ -285,11 +280,11 @@ Session::first_stage_init (string fullpath, string snapshot_name) } int -Session::second_stage_init (bool new_session) +Session::second_stage_init () { AudioFileSource::set_peak_dir (_session_dir->peak_path().to_string()); - if (!new_session) { + if (!_is_new) { if (load_state (_current_snapshot_name)) { return -1; } @@ -339,7 +334,7 @@ Session::second_stage_init (bool new_session) _engine.Xrun.connect_same_thread (*this, boost::bind (&Session::xrun_recovery, this)); try { - when_engine_running(); + when_engine_running (); } /* handle this one in a different way than all others, so that its clear what happened */ @@ -369,10 +364,10 @@ Session::second_stage_init (bool new_session) ControlProtocolManager::instance().set_session (this); - config.set_end_marker_is_free (new_session); - _state_of_the_state = Clean; + Port::set_connecting_blocked (false); + DirtyChanged (); /* EMIT SIGNAL */ if (state_was_pending) { @@ -495,7 +490,7 @@ Session::ensure_subdirs () } int -Session::create (bool& new_session, const string& mix_template, nframes_t initial_length) +Session::create (const string& mix_template, BusProfile* bus_profile) { if (g_mkdir_with_parents (_path.c_str(), 0755) < 0) { @@ -507,8 +502,6 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia return -1; } - /* check new_session so we don't overwrite an existing one */ - if (!mix_template.empty()) { std::string in_path = mix_template; @@ -523,11 +516,7 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia if (out){ out << in.rdbuf(); - - // okay, session is set up. Treat like normal saved - // session from now on. - - new_session = false; + _is_new = false; return 0; } else { @@ -550,49 +539,67 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia /* set initial start + end point */ - start_location->set_end (0); - _locations.add (start_location); - - end_location->set_end (initial_length); - _locations.add (end_location); - _state_of_the_state = Clean; + + /* set up Master Out and Control Out if necessary */ + + if (bus_profile) { + + RouteList rl; + int control_id = 1; + ChanCount count(DataType::AUDIO, bus_profile->master_out_channels); + + if (bus_profile->master_out_channels) { + Route* rt = new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO); + if (rt->init ()) { + delete rt; + return -1; + } + boost_debug_shared_ptr_mark_interesting (rt, "Route"); + boost::shared_ptr r (rt); + r->input()->ensure_io (count, false, this); + r->output()->ensure_io (count, false, this); + r->set_remote_control_id (control_id++); + + rl.push_back (r); + + if (Config->get_use_monitor_bus()) { + Route* rt = new Route (*this, _("monitor"), Route::MonitorOut, DataType::AUDIO); + if (rt->init ()) { + delete rt; + return -1; + } + boost_debug_shared_ptr_mark_interesting (rt, "Route"); + boost::shared_ptr r (rt); + r->input()->ensure_io (count, false, this); + r->output()->ensure_io (count, false, this); + r->set_remote_control_id (control_id); + + rl.push_back (r); + } - save_state (""); - - return 0; -} - - -int -Session::load_diskstreams (const XMLNode& node) -{ - XMLNodeList clist; - XMLNodeConstIterator citer; + } else { + /* prohibit auto-connect to master, because there isn't one */ + bus_profile->output_ac = AutoConnectOption (bus_profile->output_ac & ~AutoConnectMaster); + } - clist = node.children(); + if (!rl.empty()) { + add_routes (rl, false); + } - for (citer = clist.begin(); citer != clist.end(); ++citer) { + /* this allows the user to override settings with an environment variable. + */ - try { - /* diskstreams added automatically by DiskstreamCreated handler */ - if ((*citer)->name() == "AudioDiskstream" || (*citer)->name() == "DiskStream") { - AudioDiskstream* dsp (new AudioDiskstream (*this, **citer)); - boost::shared_ptr dstream (dsp); - add_diskstream (dstream); - } else if ((*citer)->name() == "MidiDiskstream") { - boost::shared_ptr dstream (new MidiDiskstream (*this, **citer)); - add_diskstream (dstream); - } else { - error << _("Session: unknown diskstream type in XML") << endmsg; - } - } + if (no_auto_connect()) { + bus_profile->input_ac = AutoConnectOption (0); + bus_profile->output_ac = AutoConnectOption (0); + } + + Config->set_input_auto_connect (bus_profile->input_ac); + Config->set_output_auto_connect (bus_profile->output_ac); + } - catch (failed_constructor& err) { - error << _("Session: could not load diskstream via XML state") << endmsg; - return -1; - } - } + save_state (""); return 0; } @@ -676,8 +683,61 @@ Session::remove_state (string snapshot_name) sys::remove (xml_path); } +#ifdef HAVE_JACK_SESSION +void +Session::jack_session_event (jack_session_event_t * event) +{ + char timebuf[128]; + time_t n; + struct tm local_time; + + time (&n); + localtime_r (&n, &local_time); + strftime (timebuf, sizeof(timebuf), "JS_%FT%T", &local_time); + + if (event->type == JackSessionSaveTemplate) + { + if (save_template( timebuf )) { + event->flags = JackSessionSaveError; + } else { + string cmd ("ardour3 -P -U "); + cmd += event->client_uuid; + cmd += " -T "; + cmd += timebuf; + + event->command_line = strdup (cmd.c_str()); + } + } + else + { + if (save_state (timebuf)) { + event->flags = JackSessionSaveError; + } else { + sys::path xml_path (_session_dir->root_path()); + xml_path /= legalize_for_path (timebuf) + statefile_suffix; + + string cmd ("ardour3 -P -U "); + cmd += event->client_uuid; + cmd += " \""; + cmd += xml_path.to_string(); + cmd += '\"'; + + event->command_line = strdup (cmd.c_str()); + } + } + + jack_session_reply (_engine.jack(), event); + + if (event->type == JackSessionSaveAndQuit) { + // TODO: make ardour quit. + } + + jack_session_event_free( event ); +} +#endif + int -Session::save_state (string snapshot_name, bool pending) +Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot) { XMLTree tree; sys::path xml_path(_session_dir->root_path()); @@ -687,21 +747,25 @@ Session::save_state (string snapshot_name, bool pending) } if (!_engine.connected ()) { - error << _("Ardour's audio engine is not connected and state saving would lose all I/O connections. Session not saved") + error << string_compose (_("the %1 audio engine is not connected and state saving would lose all I/O connections. Session not saved"), + PROGRAM_NAME) << endmsg; return 1; } /* tell sources we're saving first, in case they write out to a new file * which should be saved with the state rather than the old one */ - for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) + for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { i->second->session_saved(); + } tree.set_root (&get_state()); if (snapshot_name.empty()) { snapshot_name = _current_snapshot_name; - } + } else if (switch_to_snapshot) { + _current_snapshot_name = snapshot_name; + } if (!pending) { @@ -795,13 +859,17 @@ Session::load_state (string snapshot_name) if (!state_was_pending) { xmlpath = _session_dir->root_path(); - xmlpath /= legalize_for_path (snapshot_name) + statefile_suffix; + xmlpath /= snapshot_name; } - if (!sys::exists (xmlpath)) { - error << string_compose(_("%1: session state information file \"%2\" doesn't exist!"), _name, xmlpath.to_string()) << endmsg; - return 1; - } + if (!sys::exists (xmlpath)) { + xmlpath = _session_dir->root_path(); + xmlpath /= legalize_for_path (snapshot_name) + statefile_suffix; + if (!sys::exists (xmlpath)) { + error << string_compose(_("%1: session state information file \"%2\" doesn't exist!"), _name, xmlpath.to_string()) << endmsg; + return 1; + } + } state_tree = new XMLTree; @@ -826,7 +894,7 @@ Session::load_state (string snapshot_name) XMLNode& root (*state_tree->root()); if (root.name() != X_("Session")) { - error << string_compose (_("Session file %1 is not an Ardour session"), xmlpath.to_string()) << endmsg; + error << string_compose (_("Session file %1 is not a session"), xmlpath.to_string()) << endmsg; delete state_tree; state_tree = 0; return -1; @@ -857,8 +925,8 @@ Session::load_state (string snapshot_name) return 0; } - info << string_compose (_("Copying old session file %1 to %2\nUse %2 with Ardour versions before 2.0 from now on"), - xmlpath.to_string(), backup_path.to_string()) + info << string_compose (_("Copying old session file %1 to %2\nUse %2 with %3 versions before 2.0 from now on"), + xmlpath.to_string(), backup_path.to_string(), PROGRAM_NAME) << endmsg; try @@ -991,26 +1059,14 @@ Session::state(bool full_state) if (full_state) { Glib::Mutex::Lock rl (region_lock); - - for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { - - /* only store regions not attached to playlists */ - - if (i->second->playlist() == 0) { - child->add_child_nocopy (i->second->state (true)); - } - } - } - - child = node->add_child ("DiskStreams"); - - { - boost::shared_ptr dsl = diskstreams.reader(); - for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) { - if (!(*i)->hidden()) { - child->add_child_nocopy ((*i)->get_state()); - } - } + const RegionFactory::RegionMap& region_map (RegionFactory::all_regions()); + for (RegionFactory::RegionMap::const_iterator i = region_map.begin(); i != region_map.end(); ++i) { + boost::shared_ptr r = i->second; + /* only store regions not attached to playlists */ + if (r->playlist() == 0) { + child->add_child_nocopy (r->state (true)); + } + } } if (full_state) { @@ -1019,12 +1075,9 @@ Session::state(bool full_state) // for a template, just create a new Locations, populate it // with the default start and end, and get the state for that. Locations loc; - Location* start = new Location(0, 0, _("start"), Location::Flags ((Location::IsMark|Location::IsStart))); - Location* end = new Location(0, 0, _("end"), Location::Flags ((Location::IsMark|Location::IsEnd))); - start->set_end(0); - loc.add (start); - end->set_end(compute_initial_length()); - loc.add (end); + Location* range = new Location (0, 0, _("session"), Location::IsSessionRange); + range->set (max_frames, 0); + loc.add (range); node->add_child_nocopy (loc.get_state()); } @@ -1047,6 +1100,12 @@ Session::state(bool full_state) RouteList public_order (*r); public_order.sort (cmp); + /* the sort should have put control outs first */ + + if (_monitor_out) { + assert (_monitor_out == public_order.front()); + } + for (RouteList::iterator i = public_order.begin(); i != public_order.end(); ++i) { if (!(*i)->is_hidden()) { if (full_state) { @@ -1160,7 +1219,6 @@ Session::set_state (const XMLNode& node, int version) Locations Sources AudioRegions - AudioDiskstreams Connections Routes RouteGroups @@ -1209,22 +1267,15 @@ Session::set_state (const XMLNode& node, int version) set_auto_punch_location (location); } - if ((location = _locations.end_location()) == 0) { - _locations.add (end_location); - } else { - delete end_location; - end_location = location; + if ((location = _locations.session_range_location()) != 0) { + delete _session_range_location; + _session_range_location = location; } - if ((location = _locations.start_location()) == 0) { - _locations.add (start_location); - } else { - delete start_location; - start_location = location; + if (_session_range_location) { + AudioFileSource::set_header_position_offset (_session_range_location->start()); } - AudioFileSource::set_header_position_offset (start_location->start()); - if ((child = find_named_node (node, "Sources")) == 0) { error << _("Session: XML state has no sources section") << endmsg; goto out; @@ -1258,13 +1309,6 @@ Session::set_state (const XMLNode& node, int version) } } - if ((child = find_named_node (node, "DiskStreams")) == 0) { - error << _("Session: XML state has no diskstreams section") << endmsg; - goto out; - } else if (load_diskstreams (*child)) { - goto out; - } - if (version >= 3000) { if ((child = find_named_node (node, "Bundles")) == 0) { warning << _("Session: XML state has no bundles section") << endmsg; @@ -1284,6 +1328,15 @@ Session::set_state (const XMLNode& node, int version) goto out; } + if (version < 3000) { + if ((child = find_named_node (node, X_("DiskStreams"))) == 0) { + error << _("Session: XML state has no diskstreams section") << endmsg; + goto out; + } else if (load_diskstreams_2X (*child, version)) { + goto out; + } + } + if ((child = find_named_node (node, "Routes")) == 0) { error << _("Session: XML state has no routes section") << endmsg; goto out; @@ -1291,6 +1344,9 @@ Session::set_state (const XMLNode& node, int version) goto out; } + /* our diskstreams list is no longer needed as they are now all owned by their Route */ + _diskstreams_2X.clear (); + if (version >= 3000) { if ((child = find_named_node (node, "RouteGroups")) == 0) { @@ -1350,8 +1406,13 @@ Session::load_routes (const XMLNode& node, int version) for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - boost::shared_ptr route (XMLRouteFactory (**niter, version)); - + boost::shared_ptr route; + if (version < 3000) { + route = XMLRouteFactory_2X (**niter, version); + } else { + route = XMLRouteFactory (**niter, version); + } + if (route == 0) { error << _("Session: cannot create Route from XML description.") << endmsg; return -1; @@ -1370,35 +1431,132 @@ Session::load_routes (const XMLNode& node, int version) boost::shared_ptr Session::XMLRouteFactory (const XMLNode& node, int version) { + boost::shared_ptr ret; + if (node.name() != "Route") { - return boost::shared_ptr ((Route*) 0); + return ret; } - bool has_diskstream = (node.property ("diskstream") != 0 || node.property ("diskstream-id") != 0); + XMLNode* ds_child = find_named_node (node, X_("Diskstream")); DataType type = DataType::AUDIO; const XMLProperty* prop = node.property("default-type"); if (prop) { - type = DataType(prop->value()); + type = DataType (prop->value()); + } + + assert (type != DataType::NIL); + + if (ds_child) { + + Track* track; + + if (type == DataType::AUDIO) { + track = new AudioTrack (*this, X_("toBeResetFroXML")); + + } else { + track = new MidiTrack (*this, X_("toBeResetFroXML")); + } + + if (track->init()) { + delete track; + return ret; + } + + if (track->set_state (node, version)) { + delete track; + return ret; + } + + boost_debug_shared_ptr_mark_interesting (track, "Track"); + ret.reset (track); + + } else { + Route* rt = new Route (*this, X_("toBeResetFroXML")); + + if (rt->init () == 0 && rt->set_state (node, version) == 0) { + boost_debug_shared_ptr_mark_interesting (rt, "Route"); + ret.reset (rt); + } else { + delete rt; + } } - assert(type != DataType::NIL); + return ret; +} - if (has_diskstream) { - if (type == DataType::AUDIO) { - AudioTrack* at = new AudioTrack (*this, node, version); - // boost_debug_shared_ptr_mark_interesting (at, typeid (at).name()); - boost::shared_ptr ret (at); - return ret; - } else { - boost::shared_ptr ret (new MidiTrack (*this, node, version)); - return ret; - } - } else { - boost::shared_ptr ret (new Route (*this, node)); +boost::shared_ptr +Session::XMLRouteFactory_2X (const XMLNode& node, int version) +{ + boost::shared_ptr ret; + + if (node.name() != "Route") { return ret; } + + XMLProperty const * ds_prop = node.property (X_("diskstream-id")); + if (!ds_prop) { + ds_prop = node.property (X_("diskstream")); + } + + DataType type = DataType::AUDIO; + const XMLProperty* prop = node.property("default-type"); + + if (prop) { + type = DataType (prop->value()); + } + + assert (type != DataType::NIL); + + if (ds_prop) { + + list >::iterator i = _diskstreams_2X.begin (); + while (i != _diskstreams_2X.end() && (*i)->id() != ds_prop->value()) { + ++i; + } + + if (i == _diskstreams_2X.end()) { + error << _("Could not find diskstream for route") << endmsg; + return boost::shared_ptr (); + } + + Track* track; + + if (type == DataType::AUDIO) { + track = new AudioTrack (*this, X_("toBeResetFroXML")); + + } else { + track = new MidiTrack (*this, X_("toBeResetFroXML")); + } + + if (track->init()) { + delete track; + return ret; + } + + if (track->set_state (node, version)) { + delete track; + return ret; + } + + track->set_diskstream (*i); + + boost_debug_shared_ptr_mark_interesting (track, "Track"); + ret.reset (track); + + } else { + Route* rt = new Route (*this, X_("toBeResetFroXML")); + + if (rt->init () == 0 && rt->set_state (node, version) == 0) { + boost_debug_shared_ptr_mark_interesting (rt, "Route"); + ret.reset (rt); + } else { + delete rt; + } + } + + return ret; } int @@ -1726,7 +1884,7 @@ Session::XMLSourceFactory (const XMLNode& node) } catch (failed_constructor& err) { - error << _("Found a sound file that cannot be used by Ardour. Talk to the progammers.") << endmsg; + error << string_compose (_("Found a sound file that cannot be used by %1. Talk to the progammers."), PROGRAM_NAME) << endmsg; return boost::shared_ptr(); } } @@ -2676,6 +2834,121 @@ Session::controllable_by_id (const PBD::ID& id) return boost::shared_ptr(); } +boost::shared_ptr +Session::controllable_by_descriptor (const ControllableDescriptor& desc) +{ + boost::shared_ptr c; + boost::shared_ptr r; + + switch (desc.top_level_type()) { + case ControllableDescriptor::NamedRoute: + { + std::string str = desc.top_level_name(); + if (str == "master") { + r = _master_out; + } else if (str == "control" || str == "listen") { + r = _monitor_out; + } else { + r = route_by_name (desc.top_level_name()); + } + break; + } + + case ControllableDescriptor::RemoteControlID: + r = route_by_remote_id (desc.rid()); + break; + } + + if (!r) { + return c; + } + + switch (desc.subtype()) { + case ControllableDescriptor::Gain: + c = r->gain_control (); + break; + + case ControllableDescriptor::Solo: + c = r->solo_control(); + break; + + case ControllableDescriptor::Mute: + c = r->mute_control(); + break; + + case ControllableDescriptor::Recenable: + { + boost::shared_ptr t = boost::dynamic_pointer_cast(r); + + if (t) { + c = t->rec_enable_control (); + } + break; + } + + case ControllableDescriptor::Pan: + /* XXX pan control */ + break; + + case ControllableDescriptor::Balance: + /* XXX simple pan control */ + break; + + case ControllableDescriptor::PluginParameter: + { + uint32_t plugin = desc.target (0); + uint32_t parameter_index = desc.target (1); + + /* revert to zero based counting */ + + if (plugin > 0) { + --plugin; + } + + if (parameter_index > 0) { + --parameter_index; + } + + boost::shared_ptr p = r->nth_plugin (plugin); + + if (p) { + c = boost::dynamic_pointer_cast( + p->control(Evoral::Parameter(PluginAutomation, 0, parameter_index))); + } + break; + } + + case ControllableDescriptor::SendGain: + { + uint32_t send = desc.target (0); + + /* revert to zero-based counting */ + + if (send > 0) { + --send; + } + + boost::shared_ptr p = r->nth_send (send); + + if (p) { + boost::shared_ptr s = boost::dynamic_pointer_cast(p); + boost::shared_ptr a = s->amp(); + + if (a) { + c = s->amp()->gain_control(); + } + } + break; + } + + default: + /* relax and return a null pointer */ + break; + } + + return c; +} + void Session::add_instant_xml (XMLNode& node, bool write_to_config) { @@ -2827,6 +3100,10 @@ Session::restore_history (string snapshot_name) error << _("Failed to downcast MidiSource for DeltaCommand") << endmsg; } + } else if (n->name() == "StatefulDiffCommand") { + if ((c = stateful_diff_command_factory (n))) { + ut->add_command (c); + } } else { error << string_compose(_("Couldn't figure out how to make a Command out of a %1 XMLNode."), n->name()) << endmsg; } @@ -2856,11 +3133,11 @@ Session::config_changed (std::string p, bool ours) if (Config->get_monitoring_model() == HardwareMonitoring && transport_rolling()) { /* auto-input only makes a difference if we're rolling */ - boost::shared_ptr dsl = diskstreams.reader(); - - for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) { - if ((*i)->record_enabled ()) { - (*i)->monitor_input (!config.get_auto_input()); + boost::shared_ptr rl = routes.reader (); + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); + if (tr && tr->record_enabled ()) { + tr->monitor_input (!config.get_auto_input()); } } } @@ -3074,3 +3351,32 @@ Session::set_history_depth (uint32_t d) { _history.set_depth (d); } + +int +Session::load_diskstreams_2X (XMLNode const & node, int) +{ + XMLNodeList clist; + XMLNodeConstIterator citer; + + clist = node.children(); + + for (citer = clist.begin(); citer != clist.end(); ++citer) { + + try { + /* diskstreams added automatically by DiskstreamCreated handler */ + if ((*citer)->name() == "AudioDiskstream" || (*citer)->name() == "DiskStream") { + boost::shared_ptr dsp (new AudioDiskstream (*this, **citer)); + _diskstreams_2X.push_back (dsp); + } else { + error << _("Session: unknown diskstream type in XML") << endmsg; + } + } + + catch (failed_constructor& err) { + error << _("Session: could not load diskstream via XML state") << endmsg; + return -1; + } + } + + return 0; +}