X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_state.cc;h=4a5d974563dc0feed12b63972921db0c0d74e25c;hb=a532e7247cfccaf35edbb9b76868ead3cc9b1342;hp=5d622f95a7486a4fcf5d55c443eb302cbf0fa6a9;hpb=ebf60a31d8ad0e92109eb4b578de33a9d48cff87;p=ardour.git diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 5d622f95a7..4a5d974563 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1,12 +1,12 @@ /* - Copyright (C) 1999-2002 Paul Davis + Copyright (C) 1999-2002 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -14,9 +14,14 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + */ + +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + #define __STDC_FORMAT_MACROS 1 #include @@ -58,52 +63,53 @@ #include "pbd/search_path.h" #include "pbd/stacktrace.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audio_track.h" #include "ardour/audioengine.h" -#include "ardour/configuration.h" -#include "ardour/session.h" -#include "ardour/session_directory.h" -#include "ardour/session_utils.h" -#include "ardour/session_state_utils.h" -#include "ardour/session_metadata.h" +#include "ardour/audiofilesource.h" +#include "ardour/audioplaylist.h" +#include "ardour/audioregion.h" +#include "ardour/auditioner.h" #include "ardour/buffer.h" -#include "ardour/audio_diskstream.h" +#include "ardour/butler.h" +#include "ardour/configuration.h" +#include "ardour/control_protocol_manager.h" +#include "ardour/crossfade.h" +#include "ardour/cycle_timer.h" +#include "ardour/directory_names.h" +#include "ardour/filename_extensions.h" +#include "ardour/io_processor.h" +#include "ardour/location.h" #include "ardour/midi_diskstream.h" -#include "ardour/utils.h" -#include "ardour/audioplaylist.h" +#include "ardour/midi_patch_manager.h" #include "ardour/midi_playlist.h" -#include "ardour/smf_source.h" -#include "ardour/audiofilesource.h" -#include "ardour/silentfilesource.h" -#include "ardour/sndfilesource.h" +#include "ardour/midi_region.h" #include "ardour/midi_source.h" -#include "ardour/sndfile_helpers.h" -#include "ardour/auditioner.h" -#include "ardour/io_processor.h" -#include "ardour/send.h" -#include "ardour/processor.h" -#include "ardour/user_bundle.h" -#include "ardour/slave.h" -#include "ardour/tempo.h" -#include "ardour/audio_track.h" #include "ardour/midi_track.h" -#include "ardour/midi_patch_manager.h" -#include "ardour/cycle_timer.h" -#include "ardour/utils.h" #include "ardour/named_selection.h" -#include "ardour/version.h" -#include "ardour/location.h" -#include "ardour/audioregion.h" -#include "ardour/midi_region.h" -#include "ardour/crossfade.h" -#include "ardour/control_protocol_manager.h" +#include "ardour/playlist_factory.h" +#include "ardour/processor.h" #include "ardour/region_factory.h" +#include "ardour/route_group.h" +#include "ardour/send.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/session_metadata.h" +#include "ardour/session_state_utils.h" +#include "ardour/session_utils.h" +#include "ardour/silentfilesource.h" +#include "ardour/slave.h" +#include "ardour/smf_source.h" +#include "ardour/sndfile_helpers.h" +#include "ardour/sndfilesource.h" #include "ardour/source_factory.h" -#include "ardour/playlist_factory.h" -#include "ardour/filename_extensions.h" -#include "ardour/directory_names.h" #include "ardour/template_utils.h" +#include "ardour/tempo.h" #include "ardour/ticker.h" -#include "ardour/route_group.h" +#include "ardour/user_bundle.h" +#include "ardour/utils.h" +#include "ardour/utils.h" +#include "ardour/version.h" #include "control_protocol/control_protocol.h" @@ -135,6 +141,14 @@ Session::first_stage_init (string fullpath, string snapshot_name) _path += '/'; } + 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; + } + /* these two are just provisional settings. set_state() will likely override them. */ @@ -152,8 +166,8 @@ Session::first_stage_init (string fullpath, string snapshot_name) _non_soloed_outs_muted = false; + _listen_cnt = 0; g_atomic_int_set (&processing_prohibited, 0); - insert_cnt = 0; _transport_speed = 0; _last_transport_speed = 0; _target_transport_speed = 0; @@ -171,8 +185,6 @@ Session::first_stage_init (string fullpath, string snapshot_name) pending_locate_frame = 0; pending_locate_roll = false; pending_locate_flush = false; - audio_dstream_buffer_size = 0; - midi_dstream_buffer_size = 0; state_was_pending = false; set_next_event (); outbound_mtc_smpte_frame = 0; @@ -189,7 +201,6 @@ Session::first_stage_init (string fullpath, string snapshot_name) session_send_mmc = false; session_send_mtc = false; post_transport_work = PostTransportWork (0); - g_atomic_int_set (&butler_should_do_transport_work, 0); g_atomic_int_set (&_playback_load, 100); g_atomic_int_set (&_capture_load, 100); g_atomic_int_set (&_playback_load_min, 100); @@ -204,7 +215,6 @@ Session::first_stage_init (string fullpath, string snapshot_name) destructive_index = 0; first_file_data_format_reset = true; first_file_header_format_reset = true; - butler_thread = (pthread_t) 0; //midi_thread = (pthread_t) 0; AudioDiskstream::allocate_working_buffers(); @@ -221,7 +231,7 @@ Session::first_stage_init (string fullpath, string snapshot_name) /* click sounds are unset by default, which causes us to internal waveforms for clicks. */ - + click_length = 0; click_emphasis_length = 0; _clicking = false; @@ -286,7 +296,7 @@ Session::second_stage_init (bool new_session) remove_empty_sounds (); } - if (start_butler_thread()) { + if (_butler->start_thread()) { return -1; } @@ -298,7 +308,7 @@ Session::second_stage_init (bool new_session) // to call setup_raid_path() here. if (state_tree) { - if (set_state (*state_tree->root())) { + if (set_state (*state_tree->root(), Stateful::loading_state_version)) { return -1; } } else { @@ -333,7 +343,7 @@ Session::second_stage_init (bool new_session) } /* handle this one in a different way than all others, so that its clear what happened */ - + catch (AudioEngine::PortRegistrationFailure& err) { error << err.what() << endmsg; return -1; @@ -349,7 +359,7 @@ Session::second_stage_init (bool new_session) _engine.transport_locate (0); deliver_mmc (MIDI::MachineControl::cmdMmcReset, 0); deliver_mmc (MIDI::MachineControl::cmdLocate, 0); - + MidiClockTicker::instance().set_session(*this); MIDI::Name::MidiPatchManager::instance().set_session(*this); @@ -362,7 +372,7 @@ Session::second_stage_init (bool new_session) config.set_end_marker_is_free (new_session); _state_of_the_state = Clean; - + DirtyChanged (); /* EMIT SIGNAL */ if (state_was_pending) { @@ -370,7 +380,7 @@ Session::second_stage_init (bool new_session) remove_pending_capture_state (); state_was_pending = false; } - + BootMessage (_("Session loading complete")); return 0; @@ -384,7 +394,7 @@ Session::raid_path () const for (vector::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) { raid_search_path += sys::path((*i).path); } - + return raid_search_path.to_string (); } @@ -394,7 +404,7 @@ Session::setup_raid_path (string path) if (path.empty()) { return; } - + space_and_path sp; string fspath; @@ -441,7 +451,7 @@ Session::ensure_subdirs () error << string_compose(_("Session: cannot create session sounds dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg; return -1; } - + dir = session_directory().midi_path().to_string(); if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) { @@ -510,21 +520,21 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia return 0; } else { - error << string_compose (_("Could not open %1 for writing mix template"), out_path) + error << string_compose (_("Could not open %1 for writing mix template"), out_path) << endmsg; return -1; } } else { - error << string_compose (_("Could not open mix template %1 for reading"), in_path) + error << string_compose (_("Could not open mix template %1 for reading"), in_path) << endmsg; return -1; } } - + /* Instantiate metadata */ - + _metadata = new SessionMetadata (); /* set initial start + end point */ @@ -548,7 +558,7 @@ Session::load_diskstreams (const XMLNode& node) { XMLNodeList clist; XMLNodeConstIterator citer; - + clist = node.children(); for (citer = clist.begin(); citer != clist.end(); ++citer) { @@ -564,8 +574,8 @@ Session::load_diskstreams (const XMLNode& node) } 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; @@ -587,8 +597,8 @@ void Session::remove_pending_capture_state () { sys::path pending_state_file_path(_session_dir->root_path()); - - pending_state_file_path /= _current_snapshot_name + pending_suffix; + + pending_state_file_path /= legalize_for_path (_current_snapshot_name) + pending_suffix; try { @@ -612,8 +622,8 @@ Session::rename_state (string old_name, string new_name) return; } - const string old_xml_filename = old_name + statefile_suffix; - const string new_xml_filename = new_name + statefile_suffix; + const string old_xml_filename = legalize_for_path (old_name) + statefile_suffix; + const string new_xml_filename = legalize_for_path (new_name) + statefile_suffix; const sys::path old_xml_path = _session_dir->root_path() / old_xml_filename; const sys::path new_xml_path = _session_dir->root_path() / new_xml_filename; @@ -642,7 +652,7 @@ Session::remove_state (string snapshot_name) sys::path xml_path(_session_dir->root_path()); - xml_path /= snapshot_name + statefile_suffix; + xml_path /= legalize_for_path (snapshot_name) + statefile_suffix; if (!create_backup_file (xml_path)) { // don't remove it if a backup can't be made @@ -660,7 +670,7 @@ Session::save_state (string snapshot_name, bool pending) XMLTree tree; sys::path xml_path(_session_dir->root_path()); - if (_state_of_the_state & CannotSave) { + if (!_writable || (_state_of_the_state & CannotSave)) { return 1; } @@ -684,8 +694,8 @@ Session::save_state (string snapshot_name, bool pending) if (!pending) { /* proper save: use statefile_suffix (.ardour in English) */ - - xml_path /= snapshot_name + statefile_suffix; + + xml_path /= legalize_for_path (snapshot_name) + statefile_suffix; /* make a backup copy of the old file */ @@ -697,12 +707,12 @@ Session::save_state (string snapshot_name, bool pending) } else { /* pending save: use pending_suffix (.pending in English) */ - xml_path /= snapshot_name + pending_suffix; + xml_path /= legalize_for_path (snapshot_name) + pending_suffix; } sys::path tmp_path(_session_dir->root_path()); - tmp_path /= snapshot_name + temp_suffix; + tmp_path /= legalize_for_path (snapshot_name) + temp_suffix; // cerr << "actually writing state to " << xml_path.to_string() << endl; @@ -728,7 +738,7 @@ Session::save_state (string snapshot_name, bool pending) bool was_dirty = dirty(); _state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty); - + if (was_dirty) { DirtyChanged (); /* EMIT SIGNAL */ } @@ -743,9 +753,9 @@ int Session::restore_state (string snapshot_name) { if (load_state (snapshot_name) == 0) { - set_state (*state_tree->root()); + set_state (*state_tree->root(), Stateful::loading_state_version); } - + return 0; } @@ -760,7 +770,7 @@ Session::load_state (string snapshot_name) /* check for leftover pending state from a crashed capture attempt */ sys::path xmlpath(_session_dir->root_path()); - xmlpath /= snapshot_name + pending_suffix; + xmlpath /= legalize_for_path (snapshot_name) + pending_suffix; if (sys::exists (xmlpath)) { @@ -768,14 +778,14 @@ Session::load_state (string snapshot_name) if (AskAboutPendingState()) { state_was_pending = true; - } - } + } + } if (!state_was_pending) { xmlpath = _session_dir->root_path(); - xmlpath /= snapshot_name + statefile_suffix; + 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; @@ -785,6 +795,15 @@ Session::load_state (string snapshot_name) set_dirty(); + /* writable() really reflects the whole folder, but if for any + reason the session state file can't be written to, still + make us unwritable. + */ + + if (::access (xmlpath.to_string().c_str(), W_OK) != 0) { + _writable = false; + } + if (!state_tree->read (xmlpath.to_string())) { error << string_compose(_("Could not understand ardour file %1"), xmlpath.to_string()) << endmsg; delete state_tree; @@ -793,7 +812,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; delete state_tree; @@ -802,24 +821,24 @@ Session::load_state (string snapshot_name) } const XMLProperty* prop; - bool is_old = false; // session is _very_ old (pre-2.0) if ((prop = root.property ("version")) == 0) { /* no version implies very old version of Ardour */ - is_old = true; + Stateful::loading_state_version = 1000; } else { - int major_version; - major_version = atoi (prop->value().c_str()); // grab just the first number before the period - if (major_version < 2) { - is_old = true; - } - } + int major; + int minor; + int micro; - if (is_old) { + sscanf (prop->value().c_str(), "%d.%d.%d", &major, &minor, µ); + Stateful::loading_state_version = (major * 1000) + minor; + } + + if (Stateful::loading_state_version < CURRENT_SESSION_FILE_VERSION) { sys::path backup_path(_session_dir->root_path()); - backup_path /= snapshot_name + "-1" + statefile_suffix; + backup_path /= legalize_for_path (snapshot_name) + "-1" + statefile_suffix; // only create a backup once if (sys::exists (backup_path)) { @@ -827,7 +846,7 @@ Session::load_state (string snapshot_name) } 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()) + xmlpath.to_string(), backup_path.to_string()) << endmsg; try @@ -853,7 +872,7 @@ Session::load_options (const XMLNode& node) config.set_variables (node); - /* now reset MIDI ports because the session can have its own + /* now reset MIDI ports because the session can have its own MIDI configuration. */ @@ -873,9 +892,9 @@ Session::get_template() { /* if we don't disable rec-enable, diskstreams will believe they need to store their capture - sources in their state node. + sources in their state node. */ - + disable_record (false); return state(false); @@ -891,11 +910,11 @@ Session::state(bool full_state) char buf[16]; snprintf(buf, sizeof(buf), "%d.%d.%d", libardour3_major_version, libardour3_minor_version, libardour3_micro_version); node->add_property("version", string(buf)); - + /* store configuration settings */ if (full_state) { - + node->add_property ("name", _name); snprintf (buf, sizeof (buf), "%" PRId32, _nominal_frame_rate); node->add_property ("sample-rate", buf); @@ -924,14 +943,14 @@ Session::state(bool full_state) ++next; ++i; } - + child = node->add_child ("Path"); child->add_content (p); } } /* save the ID counter */ - + snprintf (buf, sizeof (buf), "%" PRIu64, ID::counter()); node->add_property ("id-counter", buf); @@ -947,10 +966,10 @@ Session::state(bool full_state) Glib::Mutex::Lock sl (source_lock); for (SourceMap::iterator siter = sources.begin(); siter != sources.end(); ++siter) { - + /* Don't save information about non-destructive file sources that are empty */ /* FIXME: MIDI breaks if this is made FileSource like it should be... */ - + boost::shared_ptr fs; if ((fs = boost::dynamic_pointer_cast (siter->second)) != 0) { if (!fs->destructive()) { @@ -959,18 +978,18 @@ Session::state(bool full_state) } } } - + child->add_child_nocopy (siter->second->get_state()); } } child = node->add_child ("Regions"); - if (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) { @@ -981,7 +1000,7 @@ Session::state(bool full_state) child = node->add_child ("DiskStreams"); - { + { boost::shared_ptr dsl = diskstreams.reader(); for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) { if (!(*i)->hidden()) { @@ -1004,7 +1023,7 @@ Session::state(bool full_state) loc.add (end); node->add_child_nocopy (loc.get_state()); } - + child = node->add_child ("Bundles"); { boost::shared_ptr bundles = _bundles.reader (); @@ -1019,11 +1038,11 @@ Session::state(bool full_state) child = node->add_child ("Routes"); { boost::shared_ptr r = routes.reader (); - + RoutePublicOrderSorter cmp; RouteList public_order (*r); public_order.sort (cmp); - + for (RouteList::iterator i = public_order.begin(); i != public_order.end(); ++i) { if (!(*i)->is_hidden()) { if (full_state) { @@ -1035,14 +1054,9 @@ Session::state(bool full_state) } } - - child = node->add_child ("EditGroups"); - for (list::iterator i = edit_groups.begin(); i != edit_groups.end(); ++i) { - child->add_child_nocopy ((*i)->get_state()); - } - child = node->add_child ("MixGroups"); - for (list::iterator i = mix_groups.begin(); i != mix_groups.end(); ++i) { + child = node->add_child ("RouteGroups"); + for (list::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) { child->add_child_nocopy ((*i)->get_state()); } @@ -1071,8 +1085,8 @@ Session::state(bool full_state) } } } - - + + if (_click_io) { child = node->add_child ("Click"); child->add_child_nocopy (_click_io->state (full_state)); @@ -1083,7 +1097,7 @@ Session::state(bool full_state) for (NamedSelectionList::iterator i = named_selections.begin(); i != named_selections.end(); ++i) { if (full_state) { child->add_child_nocopy ((*i)->get_state()); - } + } } } @@ -1106,7 +1120,7 @@ Session::get_control_protocol_state () } int -Session::set_state (const XMLNode& node) +Session::set_state (const XMLNode& node, int version) { XMLNodeList nlist; XMLNode* child; @@ -1114,12 +1128,16 @@ Session::set_state (const XMLNode& node) int ret = -1; _state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave); - + if (node.name() != X_("Session")){ fatal << _("programming error: Session: incorrect XML node sent to set_state()") << endmsg; return -1; } + if ((prop = node.property ("version")) != 0) { + version = atoi (prop->value ()) * 1000; + } + if ((prop = node.property ("name")) != 0) { _name = prop->value (); } @@ -1151,7 +1169,7 @@ Session::set_state (const XMLNode& node) ID::init_counter (now); } - + IO::disable_connecting (); /* Object loading order: @@ -1167,7 +1185,7 @@ Session::set_state (const XMLNode& node) AudioDiskstreams Connections Routes - EditGroups + RouteGroups MixGroups Click ControlProtocols @@ -1188,16 +1206,18 @@ Session::set_state (const XMLNode& node) if (use_config_midi_ports ()) { } - if ((child = find_named_node (node, "Metadata")) == 0) { - warning << _("Session: XML state has no metadata section (2.0 session?)") << endmsg; - } else if (_metadata->set_state (*child)) { - goto out; + if (version >= 3000) { + if ((child = find_named_node (node, "Metadata")) == 0) { + warning << _("Session: XML state has no metadata section") << endmsg; + } else if (_metadata->set_state (*child, version)) { + goto out; + } } if ((child = find_named_node (node, "Locations")) == 0) { error << _("Session: XML state has no locations section") << endmsg; goto out; - } else if (_locations.set_state (*child)) { + } else if (_locations.set_state (*child, version)) { goto out; } @@ -1267,48 +1287,62 @@ Session::set_state (const XMLNode& node) goto out; } - if ((child = find_named_node (node, "Bundles")) == 0) { - warning << _("Session: XML state has no bundles section (2.0 session?)") << endmsg; - //goto out; - } else { - /* We can't load Bundles yet as they need to be able - to convert from port names to Port objects, which can't happen until - later */ - _bundle_xml_node = new XMLNode (*child); + if (version >= 3000) { + if ((child = find_named_node (node, "Bundles")) == 0) { + warning << _("Session: XML state has no bundles section") << endmsg; + //goto out; + } else { + /* We can't load Bundles yet as they need to be able + to convert from port names to Port objects, which can't happen until + later */ + _bundle_xml_node = new XMLNode (*child); + } } - if ((child = find_named_node (node, "EditGroups")) == 0) { - error << _("Session: XML state has no edit groups section") << endmsg; - goto out; - } else if (load_edit_groups (*child)) { - goto out; - } + if (version >= 3000) { + + if ((child = find_named_node (node, "RouteGroups")) == 0) { + error << _("Session: XML state has no route groups section") << endmsg; + goto out; + } else if (load_route_groups (*child, version)) { + goto out; + } + + } else if (version < 3000) { + + if ((child = find_named_node (node, "EditGroups")) == 0) { + error << _("Session: XML state has no edit groups section") << endmsg; + goto out; + } else if (load_route_groups (*child, version)) { + goto out; + } - if ((child = find_named_node (node, "MixGroups")) == 0) { - error << _("Session: XML state has no mix groups section") << endmsg; - goto out; - } else if (load_mix_groups (*child)) { - goto out; + if ((child = find_named_node (node, "MixGroups")) == 0) { + error << _("Session: XML state has no mix groups section") << endmsg; + goto out; + } else if (load_route_groups (*child, version)) { + goto out; + } } if ((child = find_named_node (node, "TempoMap")) == 0) { error << _("Session: XML state has no Tempo Map section") << endmsg; goto out; - } else if (_tempo_map->set_state (*child)) { + } else if (_tempo_map->set_state (*child, version)) { goto out; } if ((child = find_named_node (node, "Routes")) == 0) { error << _("Session: XML state has no routes section") << endmsg; goto out; - } else if (load_routes (*child)) { + } else if (load_routes (*child, version)) { goto out; } if ((child = find_named_node (node, "Click")) == 0) { warning << _("Session: XML state has no click section") << endmsg; } else if (_click_io) { - _click_io->set_state (*child); + _click_io->set_state (*child, version); } if ((child = find_named_node (node, "ControlProtocols")) != 0) { @@ -1326,7 +1360,7 @@ Session::set_state (const XMLNode& node) } int -Session::load_routes (const XMLNode& node) +Session::load_routes (const XMLNode& node, int version) { XMLNodeList nlist; XMLNodeConstIterator niter; @@ -1338,7 +1372,7 @@ Session::load_routes (const XMLNode& node) for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - boost::shared_ptr route (XMLRouteFactory (**niter)); + boost::shared_ptr route (XMLRouteFactory (**niter, version)); if (route == 0) { error << _("Session: cannot create Route from XML description.") << endmsg; @@ -1356,29 +1390,29 @@ Session::load_routes (const XMLNode& node) } boost::shared_ptr -Session::XMLRouteFactory (const XMLNode& node) +Session::XMLRouteFactory (const XMLNode& node, int version) { if (node.name() != "Route") { return boost::shared_ptr ((Route*) 0); } bool has_diskstream = (node.property ("diskstream") != 0 || node.property ("diskstream-id") != 0); - + DataType type = DataType::AUDIO; const XMLProperty* prop = node.property("default-type"); if (prop) { type = DataType(prop->value()); - } - + } + assert(type != DataType::NIL); if (has_diskstream) { if (type == DataType::AUDIO) { - boost::shared_ptr ret (new AudioTrack (*this, node)); + boost::shared_ptr ret (new AudioTrack (*this, node, version)); return ret; } else { - boost::shared_ptr ret (new MidiTrack (*this, node)); + boost::shared_ptr ret (new MidiTrack (*this, node, version)); return ret; } } else { @@ -1420,17 +1454,17 @@ Session::XMLRegionFactory (const XMLNode& node, bool full) const XMLProperty* type = node.property("type"); try { - + if ( !type || type->value() == "audio" ) { return boost::shared_ptr(XMLAudioRegionFactory (node, full)); - + } else if (type->value() == "midi") { - + return boost::shared_ptr(XMLMidiRegionFactory (node, full)); } - + } catch (failed_constructor& err) { return boost::shared_ptr (); } @@ -1439,7 +1473,7 @@ Session::XMLRegionFactory (const XMLNode& node, bool full) } boost::shared_ptr -Session::XMLAudioRegionFactory (const XMLNode& node, bool full) +Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/) { const XMLProperty* prop; boost::shared_ptr source; @@ -1448,7 +1482,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full) SourceList master_sources; uint32_t nchans = 1; char buf[128]; - + if (node.name() != X_("Region")) { return boost::shared_ptr(); } @@ -1461,7 +1495,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full) cerr << "no name for this region\n"; abort (); } - + if ((prop = node.property (X_("source-0"))) == 0) { if ((prop = node.property ("source")) == 0) { error << _("Session: XMLNode describing a AudioRegion is incomplete (no source)") << endmsg; @@ -1475,7 +1509,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full) error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), s_id) << endmsg; return boost::shared_ptr(); } - + as = boost::dynamic_pointer_cast(source); if (!as) { error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), s_id) << endmsg; @@ -1489,14 +1523,14 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full) for (uint32_t n=1; n < nchans; ++n) { snprintf (buf, sizeof(buf), X_("source-%d"), n); if ((prop = node.property (buf)) != 0) { - + PBD::ID id2 (prop->value()); - + if ((source = source_by_id (id2)) == 0) { error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), id2) << endmsg; return boost::shared_ptr(); } - + as = boost::dynamic_pointer_cast(source); if (!as) { error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), id2) << endmsg; @@ -1509,14 +1543,14 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full) for (uint32_t n = 0; n < nchans; ++n) { snprintf (buf, sizeof(buf), X_("master-source-%d"), n); if ((prop = node.property (buf)) != 0) { - + PBD::ID id2 (prop->value()); - + if ((source = source_by_id (id2)) == 0) { error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), id2) << endmsg; return boost::shared_ptr(); } - + as = boost::dynamic_pointer_cast(source); if (!as) { error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), id2) << endmsg; @@ -1549,7 +1583,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full) } return region; - + } catch (failed_constructor& err) { @@ -1558,14 +1592,14 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full) } boost::shared_ptr -Session::XMLMidiRegionFactory (const XMLNode& node, bool full) +Session::XMLMidiRegionFactory (const XMLNode& node, bool /*full*/) { const XMLProperty* prop; boost::shared_ptr source; boost::shared_ptr ms; SourceList sources; uint32_t nchans = 1; - + if (node.name() != X_("Region")) { return boost::shared_ptr(); } @@ -1573,7 +1607,7 @@ Session::XMLMidiRegionFactory (const XMLNode& node, bool full) if ((prop = node.property (X_("channels"))) != 0) { nchans = atoi (prop->value().c_str()); } - + if ((prop = node.property ("name")) == 0) { cerr << "no name for this region\n"; abort (); @@ -1652,7 +1686,7 @@ Session::path_from_region_name (DataType type, string name, string identifier) for (n = 0; n < 999999; ++n) { if (identifier.length()) { - snprintf (buf, sizeof(buf), "%s%s%" PRIu32 "%s", name.c_str(), + snprintf (buf, sizeof(buf), "%s%s%" PRIu32 "%s", name.c_str(), identifier.c_str(), n, ext.c_str()); } else { snprintf (buf, sizeof(buf), "%s-%" PRIu32 "%s", name.c_str(), @@ -1672,7 +1706,7 @@ Session::path_from_region_name (DataType type, string name, string identifier) return ""; } - + int Session::load_sources (const XMLNode& node) @@ -1760,7 +1794,7 @@ Session::save_template (string template_name) } int -Session::rename_template (string old_name, string new_name) +Session::rename_template (string old_name, string new_name) { sys::path old_path (user_template_directory()); old_path /= old_name + template_suffix; @@ -1783,7 +1817,7 @@ Session::rename_template (string old_name, string new_name) } int -Session::delete_template (string name) +Session::delete_template (string name) { sys::path path = user_template_directory(); path /= name + template_suffix; @@ -1808,7 +1842,7 @@ Session::refresh_disk_space () /* get freespace on every FS that is part of the session path */ _total_free_4k_blocks = 0; - + for (i = session_dirs.begin(); i != session_dirs.end(); ++i) { statfs ((*i).path.c_str(), &statfsbuf); @@ -1833,8 +1867,8 @@ Session::get_best_session_directory_for_new_source () } /* OK, here's the algorithm we're following here: - - We want to select which directory to use for + + We want to select which directory to use for the next file source to be created. Ideally, we'd like to use a round-robin process so as to get maximum performance benefits from splitting @@ -1853,15 +1887,15 @@ Session::get_best_session_directory_for_new_source () So, we use a user-configurable space threshold. If there are at least 2 filesystems with more than this - much space available, we use RR selection between them. + much space available, we use RR selection between them. If not, then we pick the filesystem with the most space. This gets a good balance between the two - approaches. + approaches. */ - + refresh_disk_space (); - + int free_enough = 0; for (i = session_dirs.begin(); i != session_dirs.end(); ++i) { @@ -1897,13 +1931,13 @@ Session::get_best_session_directory_for_new_source () /* pick FS with the most freespace (and that seems to actually work ...) */ - + vector sorted; space_and_path_ascending_cmp cmp; sorted = session_dirs; sort (sorted.begin(), sorted.end(), cmp); - + for (i = sorted.begin(); i != sorted.end(); ++i) { if (create_session_directory ((*i).path)) { result = (*i).path; @@ -1928,7 +1962,7 @@ Session::load_playlists (const XMLNode& node) set_dirty(); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - + if ((playlist = XMLPlaylistFactory (**niter)) == 0) { error << _("Session: cannot create Playlist from XML description.") << endmsg; } @@ -1949,7 +1983,7 @@ Session::load_unused_playlists (const XMLNode& node) set_dirty(); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - + if ((playlist = XMLPlaylistFactory (**niter)) == 0) { error << _("Session: cannot create Playlist from XML description.") << endmsg; continue; @@ -1987,7 +2021,7 @@ Session::load_named_selections (const XMLNode& node) set_dirty(); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - + if ((ns = XMLNamedSelectionFactory (**niter)) == 0) { error << _("Session: cannot create Named Selection from XML description.") << endmsg; } @@ -2023,60 +2057,56 @@ Session::analysis_dir () const int Session::load_bundles (XMLNode const & node) { - XMLNodeList nlist = node.children(); - XMLNodeConstIterator niter; + XMLNodeList nlist = node.children(); + XMLNodeConstIterator niter; - set_dirty(); + set_dirty(); - for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->name() == "InputBundle") { + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { + if ((*niter)->name() == "InputBundle") { add_bundle (boost::shared_ptr (new UserBundle (**niter, true))); - } else if ((*niter)->name() == "OutputBundle") { - add_bundle (boost::shared_ptr (new UserBundle (**niter, false))); - } else { - error << string_compose(_("Unknown node \"%1\" found in Bundles list from state file"), (*niter)->name()) << endmsg; - return -1; - } - } + } else if ((*niter)->name() == "OutputBundle") { + add_bundle (boost::shared_ptr (new UserBundle (**niter, false))); + } else { + error << string_compose(_("Unknown node \"%1\" found in Bundles list from state file"), (*niter)->name()) << endmsg; + return -1; + } + } return 0; -} - -int -Session::load_edit_groups (const XMLNode& node) -{ - return load_route_groups (node, true); } int -Session::load_mix_groups (const XMLNode& node) -{ - return load_route_groups (node, false); -} - -int -Session::load_route_groups (const XMLNode& node, bool edit) +Session::load_route_groups (const XMLNode& node, int version) { XMLNodeList nlist = node.children(); XMLNodeConstIterator niter; - RouteGroup* rg; - set_dirty(); + set_dirty (); - for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->name() == "RouteGroup") { - if (edit) { - rg = add_edit_group (""); - rg->set_state (**niter); - } else { - rg = add_mix_group (""); - rg->set_state (**niter); + if (version >= 3000) { + + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { + if ((*niter)->name() == "RouteGroup") { + RouteGroup* rg = new RouteGroup (*this, ""); + add_route_group (rg); + rg->set_state (**niter, version); + } + } + + } else if (version < 3000) { + + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { + if ((*niter)->name() == "EditGroup" || (*niter)->name() == "MixGroup") { + RouteGroup* rg = new RouteGroup (*this, ""); + add_route_group (rg); + rg->set_state (**niter, version); } } } - + return 0; -} +} void Session::auto_save() @@ -2085,7 +2115,7 @@ Session::auto_save() } static bool -state_file_filter (const string &str, void *arg) +state_file_filter (const string &str, void */*arg*/) { return (str.length() > strlen(statefile_suffix) && str.find (statefile_suffix) == (str.length() - strlen (statefile_suffix))); @@ -2101,12 +2131,12 @@ static string* remove_end(string* state) { string statename(*state); - + string::size_type start,end; if ((start = statename.find_last_of ('/')) != string::npos) { statename = statename.substr (start+1); } - + if ((end = statename.rfind(".ardour")) == string::npos) { end = statename.length(); } @@ -2115,16 +2145,16 @@ remove_end(string* state) } vector * -Session::possible_states (string path) +Session::possible_states (string path) { PathScanner scanner; vector* states = scanner (path, state_file_filter, 0, false, false); - + transform(states->begin(), states->end(), states->begin(), remove_end); - + string_cmp cmp; sort (states->begin(), states->end(), cmp); - + return states; } @@ -2134,73 +2164,35 @@ Session::possible_states () const return possible_states(_path); } -RouteGroup * -Session::add_edit_group (string name) -{ - RouteGroup* rg = new RouteGroup (*this, name); - edit_groups.push_back (rg); - edit_group_added (rg); /* EMIT SIGNAL */ - set_dirty(); - return rg; -} - -RouteGroup * -Session::add_mix_group (string name) -{ - RouteGroup* rg = new RouteGroup (*this, name, RouteGroup::Relative); - mix_groups.push_back (rg); - mix_group_added (rg); /* EMIT SIGNAL */ - set_dirty(); - return rg; -} - void -Session::remove_edit_group (RouteGroup& rg) +Session::add_route_group (RouteGroup* g) { - list::iterator i; - - if ((i = find (edit_groups.begin(), edit_groups.end(), &rg)) != edit_groups.end()) { - (*i)->apply (&Route::drop_edit_group, this); - edit_groups.erase (i); - edit_group_removed (); /* EMIT SIGNAL */ - } - - delete &rg; + _route_groups.push_back (g); + route_group_added (g); /* EMIT SIGNAL */ + set_dirty (); } void -Session::remove_mix_group (RouteGroup& rg) +Session::remove_route_group (RouteGroup& rg) { list::iterator i; - if ((i = find (mix_groups.begin(), mix_groups.end(), &rg)) != mix_groups.end()) { - (*i)->apply (&Route::drop_mix_group, this); - mix_groups.erase (i); - mix_group_removed (); /* EMIT SIGNAL */ + if ((i = find (_route_groups.begin(), _route_groups.end(), &rg)) != _route_groups.end()) { + (*i)->apply (&Route::drop_route_group, this); + _route_groups.erase (i); + route_group_removed (); /* EMIT SIGNAL */ } delete &rg; } -RouteGroup * -Session::mix_group_by_name (string name) -{ - list::iterator i; - - for (i = mix_groups.begin(); i != mix_groups.end(); ++i) { - if ((*i)->name() == name) { - return* i; - } - } - return 0; -} RouteGroup * -Session::edit_group_by_name (string name) +Session::route_group_by_name (string name) { list::iterator i; - for (i = edit_groups.begin(); i != edit_groups.end(); ++i) { + for (i = _route_groups.begin(); i != _route_groups.end(); ++i) { if ((*i)->name() == name) { return* i; } @@ -2213,10 +2205,12 @@ Session::begin_reversible_command(const string& name) { UndoTransaction* trans = new UndoTransaction(); trans->set_name(name); + if (!_current_trans.empty()) { - _current_trans.top()->add_command(trans); + _current_trans.top()->add_command (trans); + } else { + _current_trans.push(trans); } - _current_trans.push(trans); } void @@ -2241,7 +2235,7 @@ Session::commit_reversible_command(Command *cmd) _current_trans.pop(); } -Session::GlobalRouteBooleanState +Session::GlobalRouteBooleanState Session::get_global_route_boolean (bool (Route::*method)(void) const) { GlobalRouteBooleanState s; @@ -2250,11 +2244,11 @@ Session::get_global_route_boolean (bool (Route::*method)(void) const) for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if (!(*i)->is_hidden()) { RouteBooleanState v; - + v.first =* i; Route* r = (*i).get(); v.second = (r->*method)(); - + s.push_back (v); } } @@ -2271,10 +2265,10 @@ Session::get_global_route_metering () for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if (!(*i)->is_hidden()) { RouteMeterState v; - + v.first =* i; v.second = (*i)->meter_point(); - + s.push_back (v); } } @@ -2283,7 +2277,7 @@ Session::get_global_route_metering () } void -Session::set_global_route_metering (GlobalRouteMeterState s, void* arg) +Session::set_global_route_metering (GlobalRouteMeterState s, void* arg) { for (GlobalRouteMeterState::iterator i = s.begin(); i != s.end(); ++i) { @@ -2328,18 +2322,18 @@ Session::set_global_record_enable (GlobalRouteBooleanState s, void* src) } static bool -accept_all_non_peak_files (const string& path, void *arg) +accept_all_non_peak_files (const string& path, void */*arg*/) { return (path.length() > 5 && path.find (peakfile_suffix) != (path.length() - 5)); } static bool -accept_all_state_files (const string& path, void *arg) +accept_all_state_files (const string& path, void */*arg*/) { return (path.length() > 7 && path.find (".ardour") == (path.length() - 7)); } -int +int Session::find_all_sources (string path, set& result) { XMLTree tree; @@ -2361,9 +2355,15 @@ Session::find_all_sources (string path, set& result) set_dirty(); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - + XMLProperty* prop; + if ((prop = (*niter)->property (X_("type"))) == 0) { + continue; + } + + DataType type (prop->value()); + if ((prop = (*niter)->property (X_("name"))) == 0) { continue; } @@ -2373,11 +2373,13 @@ Session::find_all_sources (string path, set& result) continue; } - sys::path source_path = _session_dir->sound_path (); + Glib::ustring found_path; + bool is_new; + uint16_t chan; - source_path /= prop->value (); - - result.insert (source_path.to_string ()); + if (FileSource::find (type, prop->value(), true, is_new, chan, found_path)) { + result.insert (found_path); + } } return 0; @@ -2400,14 +2402,14 @@ Session::find_all_sources_across_snapshots (set& result, bool exclude_th } state_files = scanner (ripped, accept_all_state_files, (void *) 0, false, true); - + if (state_files == 0) { /* impossible! */ return 0; } this_snapshot_path = _path; - this_snapshot_path += _current_snapshot_name; + this_snapshot_path += legalize_for_path (_current_snapshot_name); this_snapshot_path += statefile_suffix; for (vector::iterator i = state_files->begin(); i != state_files->end(); ++i) { @@ -2429,7 +2431,7 @@ struct RegionCounter { AudioSourceList::iterator iter; boost::shared_ptr region; uint32_t count; - + RegionCounter() : count (0) {} }; @@ -2437,7 +2439,7 @@ int Session::cleanup_sources (Session::cleanup_report& rep) { // FIXME: needs adaptation to midi - + vector > dead_sources; vector > playlists_tbd; PathScanner scanner; @@ -2450,10 +2452,10 @@ Session::cleanup_sources (Session::cleanup_report& rep) bool used; string spath; int ret = -1; - + _state_of_the_state = (StateOfTheState) (_state_of_the_state | InCleanup); - + /* step 1: consider deleting all unused playlists */ for (PlaylistList::iterator x = unused_playlists.begin(); x != unused_playlists.end(); ++x) { @@ -2491,7 +2493,7 @@ Session::cleanup_sources (Session::cleanup_report& rep) rep.space = 0; for (SourceMap::iterator i = sources.begin(); i != sources.end(); ) { - + SourceMap::iterator tmp; tmp = i; @@ -2501,10 +2503,10 @@ Session::cleanup_sources (Session::cleanup_report& rep) capture files. */ - if (!i->second->used() && i->second->length(i->second->timeline_position()) > 0) { + if (!i->second->used() && i->second->length(i->second->timeline_position()) > 0) { dead_sources.push_back (i->second); i->second->GoingAway(); - } + } i = tmp; } @@ -2526,7 +2528,7 @@ Session::cleanup_sources (Session::cleanup_report& rep) i = nexti; } - /* now do the same thing for the files that ended up in the sounds dir(s) + /* now do the same thing for the files that ended up in the sounds dir(s) but are not referenced as sources in any snapshot. */ @@ -2540,23 +2542,23 @@ Session::cleanup_sources (Session::cleanup_report& rep) state file on disk still references sources we may have already dropped. */ - + find_all_sources_across_snapshots (all_sources, true); /* add our current source list */ - + for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) { boost::shared_ptr fs; - + if ((fs = boost::dynamic_pointer_cast (i->second)) != 0) { all_sources.insert (fs->path()); - } + } } char tmppath1[PATH_MAX+1]; char tmppath2[PATH_MAX+1]; - + for (vector::iterator x = soundfiles->begin(); x != soundfiles->end(); ++x) { used = false; @@ -2589,7 +2591,7 @@ Session::cleanup_sources (Session::cleanup_report& rep) } string newpath; - + /* don't move the file across filesystems, just stick it in the `dead_sound_dir_name' directory on whichever filesystem it was already on. @@ -2599,14 +2601,14 @@ Session::cleanup_sources (Session::cleanup_report& rep) /* old school, go up 1 level */ - newpath = Glib::path_get_dirname (*x); // "sounds" + newpath = Glib::path_get_dirname (*x); // "sounds" newpath = Glib::path_get_dirname (newpath); // "session-name" } else { /* new school, go up 4 levels */ - - newpath = Glib::path_get_dirname (*x); // "audiofiles" + + newpath = Glib::path_get_dirname (*x); // "audiofiles" newpath = Glib::path_get_dirname (newpath); // "session-name" newpath = Glib::path_get_dirname (newpath); // "interchange" newpath = Glib::path_get_dirname (newpath); // "session-dir" @@ -2622,15 +2624,15 @@ Session::cleanup_sources (Session::cleanup_report& rep) newpath += '/'; newpath += Glib::path_get_basename ((*x)); - + if (access (newpath.c_str(), F_OK) == 0) { - + /* the new path already exists, try versioning */ - + char buf[PATH_MAX+1]; int version = 1; string newpath_v; - + snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), version); newpath_v = buf; @@ -2638,7 +2640,7 @@ Session::cleanup_sources (Session::cleanup_report& rep) snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), ++version); newpath_v = buf; } - + if (version == 999) { error << string_compose (_("there are already 1000 files with names like %1; versioning discontinued"), newpath) @@ -2646,11 +2648,11 @@ Session::cleanup_sources (Session::cleanup_report& rep) } else { newpath = newpath_v; } - + } else { - + /* it doesn't exist, or we can't read it or something */ - + } if (::rename ((*x).c_str(), newpath.c_str()) != 0) { @@ -2687,7 +2689,7 @@ Session::cleanup_sources (Session::cleanup_report& rep) /* save state so we don't end up a session file referring to non-existent sources. */ - + save_state (""); out: @@ -2700,7 +2702,7 @@ int Session::cleanup_trash_sources (Session::cleanup_report& rep) { // FIXME: needs adaptation for MIDI - + vector::iterator i; string dead_sound_dir; struct dirent* dentry; @@ -2711,7 +2713,7 @@ Session::cleanup_trash_sources (Session::cleanup_report& rep) rep.space = 0; for (i = session_dirs.begin(); i != session_dirs.end(); ++i) { - + dead_sound_dir = (*i).path; dead_sound_dir += dead_sound_dir_name; @@ -2722,8 +2724,8 @@ Session::cleanup_trash_sources (Session::cleanup_report& rep) while ((dentry = readdir (dead)) != 0) { /* avoid '.' and '..' */ - - if ((dentry->d_name[0] == '.' && dentry->d_name[1] == '\0') || + + if ((dentry->d_name[0] == '.' && dentry->d_name[1] == '\0') || (dentry->d_name[2] == '\0' && dentry->d_name[0] == '.' && dentry->d_name[1] == '.')) { continue; } @@ -2753,7 +2755,7 @@ Session::cleanup_trash_sources (Session::cleanup_report& rep) } closedir (dead); - + } return 0; @@ -2777,7 +2779,7 @@ void Session::set_clean () { bool was_dirty = dirty(); - + _state_of_the_state = Clean; @@ -2810,7 +2812,7 @@ Session::add_controllable (boost::shared_ptr c) Glib::Mutex::Lock lm (controllables_lock); controllables.insert (c); } - + struct null_deleter { void operator()(void const *) const {} }; void @@ -2828,13 +2830,13 @@ Session::remove_controllable (Controllable* c) if (x != controllables.end()) { controllables.erase (x); } -} +} boost::shared_ptr Session::controllable_by_id (const PBD::ID& id) { Glib::Mutex::Lock lm (controllables_lock); - + for (Controllables::iterator i = controllables.begin(); i != controllables.end(); ++i) { if ((*i)->id() == id) { return *i; @@ -2844,10 +2846,13 @@ Session::controllable_by_id (const PBD::ID& id) return boost::shared_ptr(); } -void +void Session::add_instant_xml (XMLNode& node, bool write_to_config) { - Stateful::add_instant_xml (node, _path); + if (_writable) { + Stateful::add_instant_xml (node, _path); + } + if (write_to_config) { Config->add_instant_xml (node); } @@ -2859,18 +2864,22 @@ Session::instant_xml (const string& node_name) return Stateful::instant_xml (node_name, _path); } -int +int Session::save_history (string snapshot_name) { XMLTree tree; - - if (snapshot_name.empty()) { + + if (!_writable) { + return 0; + } + + if (snapshot_name.empty()) { snapshot_name = _current_snapshot_name; } - - const string history_filename = snapshot_name + history_suffix; + + const string history_filename = legalize_for_path (snapshot_name) + history_suffix; const string backup_filename = history_filename + backup_suffix; - const sys::path xml_path = _session_dir->root_path() / history_filename; + const sys::path xml_path = _session_dir->root_path() / history_filename; const sys::path backup_path = _session_dir->root_path() / backup_filename; if (sys::exists (xml_path)) { @@ -2883,14 +2892,13 @@ Session::save_history (string snapshot_name) error << _("could not backup old history file, current history not saved") << endmsg; return -1; } - } - + } if (!Config->get_save_history() || Config->get_saved_history_depth() < 0) { return 0; } - tree.set_root (&_history.get_state (Config->get_saved_history_depth())); + tree.set_root (&_history.get_state (Config->get_saved_history_depth())); if (!tree.write (xml_path.to_string())) { @@ -2922,10 +2930,10 @@ Session::restore_history (string snapshot_name) snapshot_name = _current_snapshot_name; } - const string xml_filename = snapshot_name + history_suffix; + const string xml_filename = legalize_for_path (snapshot_name) + history_suffix; const sys::path xml_path = _session_dir->root_path() / xml_filename; - cerr << "Loading history from " << xml_path.to_string() << endmsg; + info << "Loading history from " << xml_path.to_string() << endmsg; if (!sys::exists (xml_path)) { info << string_compose (_("%1: no history file \"%2\" for this session."), @@ -2942,57 +2950,68 @@ Session::restore_history (string snapshot_name) // replace history _history.clear(); - for (XMLNodeConstIterator it = tree.root()->children().begin(); it != tree.root()->children().end(); it++) { - - XMLNode *t = *it; - UndoTransaction* ut = new UndoTransaction (); - struct timeval tv; - - ut->set_name(t->property("name")->value()); - stringstream ss(t->property("tv-sec")->value()); - ss >> tv.tv_sec; - ss.str(t->property("tv-usec")->value()); - ss >> tv.tv_usec; - ut->set_timestamp(tv); - - for (XMLNodeConstIterator child_it = t->children().begin(); + for (XMLNodeConstIterator it = tree.root()->children().begin(); it != tree.root()->children().end(); it++) { + + XMLNode *t = *it; + UndoTransaction* ut = new UndoTransaction (); + struct timeval tv; + + ut->set_name(t->property("name")->value()); + stringstream ss(t->property("tv-sec")->value()); + ss >> tv.tv_sec; + ss.str(t->property("tv-usec")->value()); + ss >> tv.tv_usec; + ut->set_timestamp(tv); + + for (XMLNodeConstIterator child_it = t->children().begin(); child_it != t->children().end(); child_it++) - { - XMLNode *n = *child_it; - Command *c; - - if (n->name() == "MementoCommand" || + { + XMLNode *n = *child_it; + Command *c; + + if (n->name() == "MementoCommand" || n->name() == "MementoUndoCommand" || n->name() == "MementoRedoCommand") { - if ((c = memento_command_factory(n))) { - ut->add_command(c); - } - - } else if (n->name() == X_("GlobalRouteStateCommand")) { - - if ((c = global_state_command_factory (*n))) { - ut->add_command (c); - } - - } else if (n->name() == "DeltaCommand") { - PBD::ID id(n->property("midi-source")->value()); - boost::shared_ptr midi_source = - boost::dynamic_pointer_cast(source_by_id(id)); - if(midi_source) { - ut->add_command(new MidiModel::DeltaCommand(midi_source->model(), *n)); - } else { - error << "FIXME: Failed to downcast MidiSource for DeltaCommand" << endmsg; - } - } else { - error << string_compose(_("Couldn't figure out how to make a Command out of a %1 XMLNode."), n->name()) << endmsg; - } - } - - _history.add (ut); - } - - return 0; + if ((c = memento_command_factory(n))) { + ut->add_command(c); + } + + } else if (n->name() == X_("GlobalRouteStateCommand")) { + + if ((c = global_state_command_factory (*n))) { + ut->add_command (c); + } + + } else if (n->name() == "DeltaCommand") { + PBD::ID id(n->property("midi-source")->value()); + boost::shared_ptr midi_source = + boost::dynamic_pointer_cast(source_by_id(id)); + if (midi_source) { + ut->add_command(new MidiModel::DeltaCommand(midi_source->model(), *n)); + } else { + error << _("Failed to downcast MidiSource for DeltaCommand") << endmsg; + } + + } else if (n->name() == "DiffCommand") { + PBD::ID id(n->property("midi-source")->value()); + boost::shared_ptr midi_source = + boost::dynamic_pointer_cast(source_by_id(id)); + if (midi_source) { + ut->add_command(new MidiModel::DiffCommand(midi_source->model(), *n)); + } else { + error << _("Failed to downcast MidiSource for DeltaCommand") << endmsg; + } + + } else { + error << string_compose(_("Couldn't figure out how to make a Command out of a %1 XMLNode."), n->name()) << endmsg; + } + } + + _history.add (ut); + } + + return 0; } void @@ -3001,20 +3020,20 @@ Session::config_changed (std::string p, bool ours) if (ours) { set_dirty (); } - + if (p == "seamless-loop") { - + } else if (p == "rf-speed") { - + } else if (p == "auto-loop") { - + } else if (p == "auto-input") { - + 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()); @@ -3025,22 +3044,22 @@ Session::config_changed (std::string p, bool ours) } else if (p == "punch-in") { Location* location; - + if ((location = _locations.auto_punch_location()) != 0) { - + if (config.get_punch_in ()) { replace_event (Event::PunchIn, location->start()); } else { remove_event (location->start(), Event::PunchIn); } } - + } else if (p == "punch-out") { Location* location; - + if ((location = _locations.auto_punch_location()) != 0) { - + if (config.get_punch_out()) { replace_event (Event::PunchOut, location->end()); } else { @@ -3051,7 +3070,7 @@ Session::config_changed (std::string p, bool ours) } else if (p == "edit-mode") { Glib::Mutex::Lock lm (playlist_lock); - + for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) { (*i)->set_edit_mode (Config->get_edit_mode ()); } @@ -3077,7 +3096,7 @@ Session::config_changed (std::string p, bool ours) } } else if (p == "midi-control") { - + //poke_midi_thread (); } else if (p == "raid-path") { @@ -3123,11 +3142,11 @@ Session::config_changed (std::string p, bool ours) } } else if (p == "send-mtc") { - + /* only set the internal flag if we have a port. */ - + if (_mtc_port != 0) { session_send_mtc = Config->get_send_mtc(); if (session_send_mtc) { @@ -3139,24 +3158,24 @@ Session::config_changed (std::string p, bool ours) } } else if (p == "send-mmc") { - + /* only set the internal flag if we have a port. */ - + if (_mmc_port != 0) { session_send_mmc = Config->get_send_mmc(); } else { mmc = 0; - session_send_mmc = false; + session_send_mmc = false; } } else if (p == "midi-feedback") { - + /* only set the internal flag if we have a port. */ - + if (_mtc_port != 0) { session_midi_feedback = Config->get_midi_feedback(); } @@ -3195,7 +3214,7 @@ Session::config_changed (std::string p, bool ours) if (_mmc_port && Config->get_initial_program_change() >= 0) { MIDI::byte buf[2]; - + buf[0] = MIDI::program; // channel zero by default buf[1] = (Config->get_initial_program_change() & 0x7f); @@ -3205,15 +3224,20 @@ Session::config_changed (std::string p, bool ours) if (_mmc_port && Config->get_initial_program_change() >= 0) { MIDI::byte* buf = new MIDI::byte[2]; - + buf[0] = MIDI::program; // channel zero by default buf[1] = (Config->get_initial_program_change() & 0x7f); // deliver_midi (_mmc_port, buf, 2); } } else if (p == "solo-mute-override") { // catch_up_on_solo_mute_override (); + } else if (p == "listen-position") { + listen_position_changed (); + } else if (p == "solo-control-is-listen-control") { + solo_control_mode_changed (); } + set_dirty (); }