X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_state.cc;h=ebb2b99cc1406eb8bebe068e6b041feef0eea170;hb=9bf40bde3aed831791108bfccc4b1e10b071afdc;hp=0bf09f76c696e7a0c48c3f55b20a91a591aadd69;hpb=ae51d5fd4ebb90f782334ac0b4addc0c88e1629c;p=ardour.git diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 0bf09f76c6..ebb2b99cc1 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -67,7 +67,6 @@ #include "pbd/debug.h" #include "pbd/enumwriter.h" #include "pbd/error.h" -#include "pbd/file_archive.h" #include "pbd/file_utils.h" #include "pbd/pathexpand.h" #include "pbd/pthread_utils.h" @@ -78,7 +77,6 @@ #include "ardour/amp.h" #include "ardour/async_midi_port.h" -#include "ardour/audio_diskstream.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" #include "ardour/audiofilesource.h" @@ -90,6 +88,7 @@ #include "ardour/controllable_descriptor.h" #include "ardour/control_protocol_manager.h" #include "ardour/directory_names.h" +#include "ardour/disk_reader.h" #include "ardour/filename_extensions.h" #include "ardour/graph.h" #include "ardour/location.h" @@ -184,7 +183,7 @@ Session::pre_engine_init (string fullpath) g_atomic_int_set (&_capture_load, 100); set_next_event (); _all_route_group->set_active (true, this); - interpolation.add_channel_to (0, 0); + interpolation.add_channel (); if (config.get_use_video_sync()) { waiting_for_sync_offset = true; @@ -225,7 +224,7 @@ Session::post_engine_init () BootMessage (_("Set block size and sample rate")); set_block_size (_engine.samples_per_cycle()); - set_frame_rate (_engine.sample_rate()); + set_sample_rate (_engine.sample_rate()); BootMessage (_("Using configuration")); @@ -237,7 +236,7 @@ Session::post_engine_init () msc->set_input_port (boost::dynamic_pointer_cast(scene_input_port())); msc->set_output_port (boost::dynamic_pointer_cast(scene_output_port())); - boost::function timer_func (boost::bind (&Session::audible_frame, this, (bool*)(0))); + boost::function timer_func (boost::bind (&Session::audible_sample, this, (bool*)(0))); boost::dynamic_pointer_cast(scene_input_port())->set_timer (timer_func); setup_midi_machine_control (); @@ -262,7 +261,7 @@ Session::post_engine_init () /* tempo map requires sample rate knowledge */ delete _tempo_map; - _tempo_map = new TempoMap (_current_frame_rate); + _tempo_map = new TempoMap (_current_sample_rate); _tempo_map->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1)); _tempo_map->MetricPositionChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1)); } catch (std::exception const & e) { @@ -282,11 +281,11 @@ Session::post_engine_init () /* crossfades require sample rate knowledge */ - SndFileSource::setup_standard_crossfades (*this, frame_rate()); + SndFileSource::setup_standard_crossfades (*this, sample_rate()); _engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this)); _engine.MidiSelectionPortsChanged.connect_same_thread (*this, boost::bind (&Session::rewire_midi_selection_ports, this)); - AudioDiskstream::allocate_working_buffers(); + DiskReader::allocate_working_buffers(); refresh_disk_space (); /* we're finally ready to call set_state() ... all objects have @@ -408,8 +407,8 @@ Session::post_engine_init () boost::shared_ptr rl = routes.reader(); for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { boost::shared_ptr trk = boost::dynamic_pointer_cast (*r); - if (trk && !trk->hidden()) { - trk->seek (_transport_frame, true); + if (trk && !trk->is_private_route()) { + trk->seek (_transport_sample, true); } } @@ -436,7 +435,7 @@ Session::session_loaded () /* Now, finally, we can fill the playback buffers */ BootMessage (_("Filling playback buffers")); - force_locate (_transport_frame, false); + force_locate (_transport_sample, false); } string @@ -756,7 +755,7 @@ Session::remove_state (string snapshot_name) /** @param snapshot_name Name to save under, without .ardour / .pending prefix */ int -Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot, bool template_only) +Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot, bool template_only, bool for_archive, bool only_used_assets) { DEBUG_TRACE (DEBUG::Locale, string_compose ("Session::save_state locale '%1'\n", setlocale (LC_NUMERIC, NULL))); @@ -766,6 +765,10 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot /* prevent concurrent saves from different threads */ Glib::Threads::Mutex::Lock lm (save_state_lock); + Glib::Threads::Mutex::Lock lx (save_source_lock, Glib::Threads::NOT_LOCK); + if (!for_archive) { + lx.acquire (); + } if (!_writable || (_state_of_the_state & CannotSave)) { return 1; @@ -778,7 +781,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot _save_queued = false; snapshot_t fork_state = NormalSave; - if (!snapshot_name.empty() && snapshot_name != _current_snapshot_name && !template_only && !pending) { + if (!snapshot_name.empty() && snapshot_name != _current_snapshot_name && !template_only && !pending && !for_archive) { /* snapshot, close midi */ fork_state = switch_to_snapshot ? SwitchToSnapshot : SnapshotKeep; } @@ -797,10 +800,11 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot } } + PBD::Unwinder uw (LV2Plugin::force_state_save, for_archive); + SessionSaveUnderway (); /* EMIT SIGNAL */ bool mark_as_clean = true; - if (!snapshot_name.empty() && !switch_to_snapshot) { mark_as_clean = false; } @@ -809,7 +813,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot mark_as_clean = false; tree.set_root (&get_template()); } else { - tree.set_root (&state (true, fork_state)); + tree.set_root (&state (false, fork_state, only_used_assets)); } if (snapshot_name.empty()) { @@ -842,7 +846,9 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot std::string tmp_path(_session_dir->root_path()); tmp_path = Glib::build_filename (tmp_path, legalize_for_path (snapshot_name) + temp_suffix); +#ifndef NDEBUG cerr << "actually writing state to " << tmp_path << endl; +#endif if (!tree.write (tmp_path)) { error << string_compose (_("state could not be saved to %1"), tmp_path) << endmsg; @@ -854,7 +860,9 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot } else { +#ifndef NDEBUG cerr << "renaming state to " << xml_path << endl; +#endif if (::g_rename (tmp_path.c_str(), xml_path.c_str()) != 0) { error << string_compose (_("could not rename temporary session file %1 to %2 (%3)"), @@ -867,7 +875,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot } } - if (!pending) { + if (!pending && !for_archive) { save_history (snapshot_name); @@ -1010,13 +1018,15 @@ Session::save_default_options () } XMLNode& -Session::get_state() +Session::get_state () { - return state(true); + /* this is not directly called, but required by PBD::Stateful */ + assert (0); + return state (false, NormalSave); } XMLNode& -Session::get_template() +Session::get_template () { /* if we don't disable rec-enable, diskstreams will believe they need to store their capture @@ -1025,7 +1035,7 @@ Session::get_template() disable_record (false); - return state(false); + return state (true, NormalSave); } typedef std::set > PlaylistSet; @@ -1102,6 +1112,12 @@ Session::export_track_state (boost::shared_ptr rl, const string& path return tree.write (sn.c_str()); } +static void +merge_all_sources (boost::shared_ptr pl, std::set >* all_sources) +{ + pl->deep_sources (*all_sources); +} + namespace { struct route_id_compare { @@ -1114,12 +1130,14 @@ struct route_id_compare { } // anon namespace XMLNode& -Session::state (bool full_state, snapshot_t snapshot_type) +Session::state (bool save_template, snapshot_t snapshot_type, bool only_used_assets) { LocaleGuard lg; XMLNode* node = new XMLNode("Session"); XMLNode* child; + PBD::Unwinder uw (Automatable::skip_saving_automation, save_template); + node->set_property("version", CURRENT_SESSION_FILE_VERSION); child = node->add_child ("ProgramVersion"); @@ -1130,10 +1148,10 @@ Session::state (bool full_state, snapshot_t snapshot_type) /* store configuration settings */ - if (full_state) { + if (!save_template) { node->set_property ("name", _name); - node->set_property ("sample-rate", _base_frame_rate); + node->set_property ("sample-rate", _base_sample_rate); if (session_dirs.size() > 1) { @@ -1192,7 +1210,7 @@ Session::state (bool full_state, snapshot_t snapshot_type) } XMLNode& cfgxml (config.get_variables ()); - if (!full_state) { + if (save_template) { /* exclude search-paths from template */ cfgxml.remove_nodes_and_delete ("name", "audio-search-path"); cfgxml.remove_nodes_and_delete ("name", "midi-search-path"); @@ -1204,9 +1222,16 @@ Session::state (bool full_state, snapshot_t snapshot_type) child = node->add_child ("Sources"); - if (full_state) { + if (!save_template) { Glib::Threads::Mutex::Lock sl (source_lock); + set > sources_used_by_this_snapshot; + + if (only_used_assets) { + playlists->sync_all_regions_with_regions (); + playlists->foreach (boost::bind (merge_all_sources, _1, &sources_used_by_this_snapshot), false); + } + for (SourceMap::iterator siter = sources.begin(); siter != sources.end(); ++siter) { /* Don't save information about non-file Sources, or @@ -1225,6 +1250,17 @@ Session::state (bool full_state, snapshot_t snapshot_type) } } + if (only_used_assets) { + /* skip only unused audio files */ + boost::shared_ptr afs = boost::dynamic_pointer_cast (fs); + if (afs && !afs->used()) { + continue; + } + if (afs && sources_used_by_this_snapshot.find (afs) == sources_used_by_this_snapshot.end ()) { + continue; + } + } + if (snapshot_type != NormalSave && fs->within_session ()) { /* copy MIDI sources to new file * @@ -1254,7 +1290,7 @@ Session::state (bool full_state, snapshot_t snapshot_type) if (!ms->model()) { ms->load_model (lm); } - if (ms->write_to (lm, newsrc, Evoral::MinBeats, Evoral::MaxBeats)) { + if (ms->write_to (lm, newsrc, Temporal::Beats(), std::numeric_limits::max())) { error << string_compose (_("Session-Save: Failed to copy MIDI Source '%1' for snapshot"), ancestor_name) << endmsg; } else { if (snapshot_type == SnapshotKeep) { @@ -1292,17 +1328,20 @@ Session::state (bool full_state, snapshot_t snapshot_type) child = node->add_child ("Regions"); - if (full_state) { + if (!save_template) { Glib::Threads::Mutex::Lock rl (region_lock); - 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) { - if (boost::dynamic_pointer_cast(r)) { - child->add_child_nocopy ((boost::dynamic_pointer_cast(r))->get_basic_state ()); - } else { - child->add_child_nocopy (r->get_state ()); + + if (!only_used_assets) { + 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) { + if (boost::dynamic_pointer_cast(r)) { + child->add_child_nocopy ((boost::dynamic_pointer_cast(r))->get_basic_state ()); + } else { + child->add_child_nocopy (r->get_state ()); + } } } } @@ -1313,15 +1352,26 @@ Session::state (bool full_state, snapshot_t snapshot_type) XMLNode* ca = node->add_child (X_("CompoundAssociations")); for (RegionFactory::CompoundAssociations::iterator i = cassocs.begin(); i != cassocs.end(); ++i) { + if (i->first->playlist () == 0 && only_used_assets) { + continue; + } XMLNode* can = new XMLNode (X_("CompoundAssociation")); can->set_property (X_("copy"), i->first->id()); can->set_property (X_("original"), i->second->id()); ca->add_child_nocopy (*can); + /* see above, child is still "Regions" here */ + if (i->second->playlist() == 0 && only_used_assets) { + if (boost::shared_ptr ar = boost::dynamic_pointer_cast( i->second)) { + child->add_child_nocopy (ar->get_basic_state ()); + } else { + child->add_child_nocopy (ar->get_state ()); + } + } } } } - if (full_state) { + if (!save_template) { node->add_child_nocopy (_selection->get_state()); @@ -1334,7 +1384,7 @@ Session::state (bool full_state, snapshot_t snapshot_type) // for a template, just create a new Locations, populate it // with the default start and end, and get the state for that. Location* range = new Location (*this, 0, 0, _("session"), Location::IsSessionRange, 0); - range->set (max_framepos, 0); + range->set (max_samplepos, 0); loc.add (range); XMLNode& locations_state = loc.get_state(); @@ -1381,16 +1431,16 @@ Session::state (bool full_state, snapshot_t snapshot_type) for (RouteList::const_iterator i = xml_node_order.begin(); i != xml_node_order.end(); ++i) { if (!(*i)->is_auditioner()) { - if (full_state) { - child->add_child_nocopy ((*i)->get_state()); - } else { + if (save_template) { child->add_child_nocopy ((*i)->get_template()); + } else { + child->add_child_nocopy ((*i)->get_state()); } } } } - playlists->add_state (node, full_state); + playlists->add_state (node, save_template, !only_used_assets); child = node->add_child ("RouteGroups"); for (list::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) { @@ -1399,18 +1449,18 @@ Session::state (bool full_state, snapshot_t snapshot_type) if (_click_io) { XMLNode* gain_child = node->add_child ("Click"); - gain_child->add_child_nocopy (_click_io->state (full_state)); - gain_child->add_child_nocopy (_click_gain->state (full_state)); + gain_child->add_child_nocopy (_click_io->get_state ()); + gain_child->add_child_nocopy (_click_gain->get_state ()); } if (_ltc_input) { XMLNode* ltc_input_child = node->add_child ("LTC-In"); - ltc_input_child->add_child_nocopy (_ltc_input->state (full_state)); + ltc_input_child->add_child_nocopy (_ltc_input->get_state ()); } if (_ltc_input) { XMLNode* ltc_output_child = node->add_child ("LTC-Out"); - ltc_output_child->add_child_nocopy (_ltc_output->state (full_state)); + ltc_output_child->add_child_nocopy (_ltc_output->get_state ()); } node->add_child_nocopy (_speakers->get_state()); @@ -1468,13 +1518,13 @@ Session::set_state (const XMLNode& node, int version) node.get_property ("name", _name); - if (node.get_property (X_("sample-rate"), _base_frame_rate)) { + if (node.get_property (X_("sample-rate"), _base_sample_rate)) { - _nominal_frame_rate = _base_frame_rate; + _nominal_sample_rate = _base_sample_rate; assert (AudioEngine::instance()->running ()); - if (_base_frame_rate != AudioEngine::instance()->sample_rate ()) { - boost::optional r = AskAboutSampleRateMismatch (_base_frame_rate, _current_frame_rate); + if (_base_sample_rate != AudioEngine::instance()->sample_rate ()) { + boost::optional r = AskAboutSampleRateMismatch (_base_sample_rate, _current_sample_rate); if (r.get_value_or (0)) { goto out; } @@ -1610,15 +1660,6 @@ Session::set_state (const XMLNode& node, int version) } } - 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, VCAManager::xml_node_name)) != 0) { _vca_manager->set_state (*child, version); } @@ -1634,9 +1675,6 @@ Session::set_state (const XMLNode& node, int version) Slavable::Assign (_vca_manager); /* EMIT SIGNAL */ - /* 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) { @@ -1723,8 +1761,11 @@ Session::load_routes (const XMLNode& node, int version) for (niter = nlist.begin(); niter != nlist.end(); ++niter) { boost::shared_ptr route; + if (version < 3000) { route = XMLRouteFactory_2X (**niter, version); + } else if (version < 5000) { + route = XMLRouteFactory_3X (**niter, version); } else { route = XMLRouteFactory (**niter, version); } @@ -1757,6 +1798,63 @@ Session::XMLRouteFactory (const XMLNode& node, int version) return ret; } + XMLProperty const * pl_prop = node.property (X_("audio-playlist")); + + if (!pl_prop) { + pl_prop = node.property (X_("midi-playlist")); + } + + DataType type = DataType::AUDIO; + node.get_property("default-type", type); + + assert (type != DataType::NIL); + + if (pl_prop) { + + /* has at least 1 playlist, therefore a track ... */ + + boost::shared_ptr track; + + if (type == DataType::AUDIO) { + track.reset (new AudioTrack (*this, X_("toBeResetFroXML"))); + } else { + track.reset (new MidiTrack (*this, X_("toBeResetFroXML"))); + } + + if (track->init()) { + return ret; + } + + if (track->set_state (node, version)) { + return ret; + } + + BOOST_MARK_TRACK (track); + ret = track; + + } else { + PresentationInfo::Flag flags = PresentationInfo::get_flags (node); + boost::shared_ptr r (new Route (*this, X_("toBeResetFroXML"), flags)); + + + if (r->init () == 0 && r->set_state (node, version) == 0) { + BOOST_MARK_ROUTE (r); + ret = r; + } + } + + return ret; +} + +boost::shared_ptr +Session::XMLRouteFactory_3X (const XMLNode& node, int version) +{ + boost::shared_ptr ret; + + if (node.name() != "Route") { + return ret; + } + XMLNode* ds_child = find_named_node (node, X_("Diskstream")); DataType type = DataType::AUDIO; @@ -1819,15 +1917,12 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version) if (ds_prop) { - list >::iterator i = _diskstreams_2X.begin (); - while (i != _diskstreams_2X.end() && (*i)->id() != ds_prop->value()) { - ++i; - } + /* see comment in current ::set_state() regarding diskstream + * state and DiskReader/DiskWRiter. + */ - if (i == _diskstreams_2X.end()) { - error << _("Could not find diskstream for route") << endmsg; - return boost::shared_ptr (); - } + error << _("Could not find diskstream for route") << endmsg; + return boost::shared_ptr (); boost::shared_ptr track; @@ -1845,8 +1940,6 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version) return ret; } - track->set_diskstream (*i); - BOOST_MARK_TRACK (track); ret = track; @@ -2303,7 +2396,7 @@ retry: switch (err.type) { case DataType::AUDIO: - source = SourceFactory::createSilent (*this, **niter, max_framecnt, _current_frame_rate); + source = SourceFactory::createSilent (*this, **niter, max_samplecnt, _current_sample_rate); break; case DataType::MIDI: @@ -2322,7 +2415,7 @@ retry: return -1; } /* Note that we do not announce the source just yet - we need to reset its ID before we do that */ - source = SourceFactory::createWritable (DataType::MIDI, *this, fullpath, false, _current_frame_rate, false, false); + source = SourceFactory::createWritable (DataType::MIDI, *this, fullpath, false, _current_sample_rate, false, false); /* reset ID to match the missing one */ source->set_id (**niter); /* Now we can announce it */ @@ -2414,12 +2507,14 @@ Session::save_template (const string& template_name, const string& description, XMLNode* root; { PBD::Unwinder uw (_template_state_dir, template_dir_path); - root = &get_template(); + root = &get_template (); } + root->remove_nodes_and_delete (X_("description")); + if (!description.empty()) { - XMLNode* desc = new XMLNode(X_("description")); - XMLNode* desc_cont = new XMLNode(X_("content"), description); + XMLNode* desc = new XMLNode (X_("description")); + XMLNode* desc_cont = new XMLNode (X_("content"), description); desc->add_child_nocopy (*desc_cont); root->add_child_nocopy (*desc); @@ -3215,12 +3310,6 @@ Session::cleanup_peakfiles () return 0; } -static void -merge_all_sources (boost::shared_ptr pl, std::set >* all_sources) -{ - pl->deep_sources (*all_sources); -} - int Session::cleanup_sources (CleanupReport& rep) { @@ -3885,7 +3974,6 @@ Session::restore_history (string snapshot_name) for (XMLNodeConstIterator it = tree.root()->children().begin(); it != tree.root()->children().end(); ++it) { XMLNode *t = *it; - UndoTransaction* ut = new UndoTransaction (); std::string name; int64_t tv_sec; @@ -3896,6 +3984,7 @@ Session::restore_history (string snapshot_name) continue; } + UndoTransaction* ut = new UndoTransaction (); ut->set_name (name); struct timeval tv; @@ -3971,11 +4060,7 @@ Session::config_changed (std::string p, bool ours) set_dirty (); } - if (p == "seamless-loop") { - - } else if (p == "rf-speed") { - - } else if (p == "auto-loop") { + if (p == "auto-loop") { } else if (p == "session-monitoring") { @@ -3993,9 +4078,9 @@ Session::config_changed (std::string p, bool ours) if ((location = _locations->auto_punch_location()) != 0) { if (config.get_punch_in ()) { - replace_event (SessionEvent::PunchIn, location->start()); + auto_punch_start_changed (location); } else { - remove_event (location->start(), SessionEvent::PunchIn); + clear_events (SessionEvent::PunchIn); } } @@ -4006,7 +4091,7 @@ Session::config_changed (std::string p, bool ours) if ((location = _locations->auto_punch_location()) != 0) { if (config.get_punch_out()) { - replace_event (SessionEvent::PunchOut, location->end()); + auto_punch_end_changed (location); } else { clear_events (SessionEvent::PunchOut); } @@ -4102,6 +4187,11 @@ Session::config_changed (std::string p, bool ours) } else if (p == "send-mmc") { _mmc->enable_send (Config->get_send_mmc ()); + if (Config->get_send_mmc ()) { + /* re-initialize MMC */ + send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdMmcReset)); + send_immediate_mmc (MIDI::MachineControlCommand (Timecode::Time ())); + } } else if (p == "jack-time-master") { @@ -4158,7 +4248,7 @@ Session::config_changed (std::string p, bool ours) } else if (p == "timecode-offset" || p == "timecode-offset-negative") { last_timecode_valid = false; } else if (p == "playback-buffer-seconds") { - AudioSource::allocate_working_buffers (frame_rate()); + AudioSource::allocate_working_buffers (sample_rate()); } else if (p == "ltc-source-port") { reconnect_ltc_input (); } else if (p == "ltc-sink-port") { @@ -4178,35 +4268,6 @@ 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; -} - /** Connect things to the MMC object */ void Session::setup_midi_machine_control () @@ -4741,21 +4802,33 @@ Session::save_as_bring_callback (uint32_t,uint32_t,string) } static string -make_new_media_path (string old_path, string new_session_folder, string new_session_path) +make_new_media_path (string old_path, string new_session_folder, string new_session_name) { - /* typedir is the "midifiles" or "audiofiles" etc. part of the path. */ - + // old_path must be in within_session () string typedir = Glib::path_get_basename (Glib::path_get_dirname (old_path)); vector v; v.push_back (new_session_folder); /* full path */ v.push_back (interchange_dir_name); - v.push_back (new_session_path); /* just one directory/folder */ + v.push_back (new_session_name); /* just one directory/folder */ v.push_back (typedir); v.push_back (Glib::path_get_basename (old_path)); return Glib::build_filename (v); } +static string +make_new_audio_path (string filename, string new_session_folder, string new_session_name) +{ + vector v; + v.push_back (new_session_folder); /* full path */ + v.push_back (interchange_dir_name); + v.push_back (new_session_name); + v.push_back (ARDOUR::sound_dir_name); + v.push_back (filename); + + return Glib::build_filename (v); +} + int Session::save_as (SaveAs& saveas) { @@ -5193,6 +5266,7 @@ int Session::archive_session (const std::string& dest, const std::string& name, ArchiveEncode compress_audio, + FileArchive::CompressionLevel compression_level, bool only_used_sources, Progress* progress) { @@ -5200,8 +5274,13 @@ Session::archive_session (const std::string& dest, return -1; } + /* We are going to temporarily change some source properties, + * don't allow any concurrent saves (periodic or otherwise */ + Glib::Threads::Mutex::Lock lm (save_source_lock); + + disable_record (false); + /* save current values */ - bool was_dirty = dirty (); string old_path = _path; string old_name = _name; string old_snapshot = _current_snapshot_name; @@ -5256,7 +5335,7 @@ Session::archive_session (const std::string& dest, } /* prepare archive */ - string archive = Glib::build_filename (dest, name + ".tar.xz"); + string archive = Glib::build_filename (dest, name + session_archive_suffix); PBD::ScopedConnectionList progress_connection; PBD::FileArchive ar (archive); @@ -5283,6 +5362,7 @@ Session::archive_session (const std::string& dest, blacklist_dirs.push_back (string (plugins_dir_name) + G_DIR_SEPARATOR); std::map, std::string> orig_sources; + std::map, std::string> orig_origin; std::map, float> orig_gain; set > sources_used_by_this_snapshot; @@ -5291,11 +5371,31 @@ Session::archive_session (const std::string& dest, playlists->foreach (boost::bind (merge_all_sources, _1, &sources_used_by_this_snapshot), false); } - // collect audio sources for this session, calc total size for encoding - // add option to only include *used* sources (see Session::cleanup_sources) + /* collect audio sources for this session, calc total size for encoding + * add option to only include *used* sources (see Session::cleanup_sources) + */ size_t total_size = 0; { Glib::Threads::Mutex::Lock lm (source_lock); + + /* build a list of used names */ + std::set audio_file_names; + for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { + boost::shared_ptr afs = boost::dynamic_pointer_cast (i->second); + if (!afs || afs->readable_length () == 0) { + continue; + } + if (only_used_sources) { + if (!afs->used()) { + continue; + } + if (sources_used_by_this_snapshot.find (afs) == sources_used_by_this_snapshot.end ()) { + continue; + } + } + audio_file_names.insert (Glib::path_get_basename (afs->path())); + } + for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) { boost::shared_ptr afs = boost::dynamic_pointer_cast (i->second); if (!afs || afs->readable_length () == 0) { @@ -5316,11 +5416,34 @@ Session::archive_session (const std::string& dest, if (compress_audio != NO_ENCODE) { total_size += afs->readable_length (); } else { - if (afs->within_session()) { - filemap[from] = make_new_media_path (from, name, name); + /* copy files as-is */ + if (!afs->within_session()) { + string to = Glib::path_get_basename (from); + + /* avoid name collitions, see also new_audio_source_path_for_embedded () + * - avoid conflict with files existing in interchange + * - avoid conflict with other embedded sources + */ + if (audio_file_names.find (to) == audio_file_names.end ()) { + // we need a new name, add a '-' before the '.' + string bn = to.substr (0, to.find_last_of ('.')); + string ext = to.find_last_of ('.') == string::npos ? "" : to.substr (to.find_last_of ('.')); + to = bn + "-1" + ext; + } + while (audio_file_names.find (to) == audio_file_names.end ()) { + to = bump_name_once (to, '-'); + } + + audio_file_names.insert (to); + filemap[from] = make_new_audio_path (to, name, name); + + remove_dir_from_search_path (Glib::path_get_dirname (from), DataType::AUDIO); + + orig_origin[afs] = afs->origin (); + afs->set_origin (""); + } else { filemap[from] = make_new_media_path (from, name, name); - remove_dir_from_search_path (Glib::path_get_dirname (from), DataType::AUDIO); } } } @@ -5353,9 +5476,23 @@ Session::archive_session (const std::string& dest, orig_gain[afs] = afs->gain(); std::string new_path = make_new_media_path (afs->path (), to_dir, name); - new_path = Glib::build_filename (Glib::path_get_dirname (new_path), PBD::basename_nosuffix (new_path) + ".flac"); + + std::string channelsuffix = ""; + if (afs->channel() > 0) { /* n_channels() is /wrongly/ 1. */ + /* embedded external multi-channel files are converted to multiple-mono */ + channelsuffix = string_compose ("-c%1", afs->channel ()); + } + new_path = Glib::build_filename (Glib::path_get_dirname (new_path), PBD::basename_nosuffix (new_path) + channelsuffix + ".flac"); g_mkdir_with_parents (Glib::path_get_dirname (new_path).c_str (), 0755); + /* avoid name collisions of external files with same name */ + if (Glib::file_test (new_path, Glib::FILE_TEST_EXISTS)) { + new_path = Glib::build_filename (Glib::path_get_dirname (new_path), PBD::basename_nosuffix (new_path) + channelsuffix + "-1.flac"); + } + while (Glib::file_test (new_path, Glib::FILE_TEST_EXISTS)) { + new_path = bump_name_once (new_path, '-'); + } + if (progress) { progress->descend ((float)afs->readable_length () / total_size); } @@ -5437,10 +5574,9 @@ Session::archive_session (const std::string& dest, /* write session file */ _path = to_dir; g_mkdir_with_parents (externals_dir ().c_str (), 0755); -#ifdef LV2_SUPPORT - PBD::Unwinder uw (LV2Plugin::force_state_save, true); -#endif - save_state (name); + + save_state (name, false, false, false, true, only_used_sources); + save_default_options (); size_t prefix_len = _path.size(); @@ -5482,12 +5618,12 @@ Session::archive_session (const std::string& dest, _name = old_name; set_snapshot_name (old_snapshot); (*_session_dir) = old_sd; - if (was_dirty) { - set_dirty (); - } config.set_audio_search_path (old_config_search_path[DataType::AUDIO]); config.set_midi_search_path (old_config_search_path[DataType::MIDI]); + for (std::map, std::string>::iterator i = orig_origin.begin (); i != orig_origin.end (); ++i) { + i->first->set_origin (i->second); + } for (std::map, std::string>::iterator i = orig_sources.begin (); i != orig_sources.end (); ++i) { i->first->replace_file (i->second); } @@ -5495,7 +5631,7 @@ Session::archive_session (const std::string& dest, i->first->set_gain (i->second, true); } - int rv = ar.create (filemap); + int rv = ar.create (filemap, compression_level); remove_directory (to_dir); return rv;