X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_state.cc;h=bcc37dde51410abb0f6eae5dac46f43632900d5a;hb=9a2164056752a958542f2d162ed3bf0f9c304121;hp=dea341bf15b31f4f86af2d276b155028658333ba;hpb=a5ea47ff0db48e9b5549f309eb6951138b063de4;p=ardour.git diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index dea341bf15..bcc37dde51 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -6,7 +6,7 @@ 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. @@ -28,8 +28,6 @@ #include #include #include - - #include /* snprintf(3) ... grrr */ #include #include @@ -48,14 +46,19 @@ #include #endif +#include + #include #include +#include + #include "midi++/mmc.h" #include "midi++/port.h" #include "midi++/manager.h" #include "pbd/boost_debug.h" +#include "pbd/basename.h" #include "pbd/controllable_descriptor.h" #include "pbd/enumwriter.h" #include "pbd/error.h" @@ -68,6 +71,7 @@ #include "ardour/amp.h" #include "ardour/audio_diskstream.h" +#include "ardour/audio_playlist_source.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" #include "ardour/audiofilesource.h" @@ -86,15 +90,18 @@ #include "ardour/io_processor.h" #include "ardour/location.h" #include "ardour/midi_diskstream.h" +#include "ardour/midi_model.h" #include "ardour/midi_patch_manager.h" #include "ardour/midi_playlist.h" #include "ardour/midi_region.h" #include "ardour/midi_source.h" #include "ardour/midi_track.h" #include "ardour/named_selection.h" -#include "ardour/panner.h" +#include "ardour/pannable.h" #include "ardour/processor.h" #include "ardour/port.h" +#include "ardour/proxy_controllable.h" +#include "ardour/recent_sessions.h" #include "ardour/region_factory.h" #include "ardour/route_group.h" #include "ardour/send.h" @@ -110,6 +117,7 @@ #include "ardour/sndfile_helpers.h" #include "ardour/sndfilesource.h" #include "ardour/source_factory.h" +#include "ardour/speakers.h" #include "ardour/template_utils.h" #include "ardour/tempo.h" #include "ardour/ticker.h" @@ -128,6 +136,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; +/** @param snapshot_name Snapshot name, without the .ardour prefix */ void Session::first_stage_init (string fullpath, string snapshot_name) { @@ -145,16 +154,10 @@ Session::first_stage_init (string fullpath, string snapshot_name) _path = string(buf); - if (_path[_path.length()-1] != '/') { + if (_path[_path.length()-1] != G_DIR_SEPARATOR) { _path += G_DIR_SEPARATOR; } - if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS) && ::access (_path.c_str(), W_OK)) { - _writable = false; - } else { - _writable = true; - } - /* these two are just provisional settings. set_state() will likely override them. */ @@ -206,7 +209,8 @@ Session::first_stage_init (string fullpath, string snapshot_name) _state_of_the_state = StateOfTheState(CannotSave|InitialConnecting|Loading); _was_seamless = Config->get_seamless_loop (); _slave = 0; - session_send_mtc = false; + _send_qf_mtc = false; + _pframes_since_last_mtc = 0; g_atomic_int_set (&_playback_load, 100); g_atomic_int_set (&_capture_load, 100); _play_range = false; @@ -219,13 +223,15 @@ Session::first_stage_init (string fullpath, string snapshot_name) midi_control_ui = 0; _step_editors = 0; no_questions_about_missing_files = false; - _speakers = 0; + _speakers.reset (new Speakers); + _clicks_cleared = 0; + ignore_route_processor_changes = false; AudioDiskstream::allocate_working_buffers(); /* default short fade = 15ms */ - Crossfade::set_short_xfade_length ((nframes_t) floor (config.get_short_xfade_seconds() * frame_rate())); + Crossfade::set_short_xfade_length ((framecnt_t) floor (config.get_short_xfade_seconds() * frame_rate())); SndFileSource::setup_standard_crossfades (*this, frame_rate()); last_mmc_step.tv_sec = 0; @@ -256,7 +262,9 @@ Session::first_stage_init (string fullpath, string snapshot_name) last_rr_session_dir = session_dirs.begin(); refresh_disk_space (); - // set_default_fade (0.2, 5.0); /* steepness, millisecs */ + /* default: assume simple stereo speaker configuration */ + + _speakers->setup_default_speakers (2); /* slave stuff */ @@ -265,6 +273,11 @@ Session::first_stage_init (string fullpath, string snapshot_name) delta_accumulator_cnt = 0; _slave_state = Stopped; + _solo_cut_control.reset (new ProxyControllable (_("solo cut control (dB)"), PBD::Controllable::GainLike, + boost::bind (&RCConfiguration::set_solo_mute_gain, Config, _1), + boost::bind (&RCConfiguration::get_solo_mute_gain, Config))); + add_controllable (_solo_cut_control); + _engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this)); /* These are all static "per-class" signals */ @@ -290,7 +303,6 @@ Session::second_stage_init () if (load_state (_current_snapshot_name)) { return -1; } - cleanup_stubfiles (); } if (_butler->start_thread()) { @@ -364,10 +376,6 @@ Session::second_stage_init () /* initial program change will be delivered later; see ::config_changed() */ - BootMessage (_("Reset Control Protocols")); - - ControlProtocolManager::instance().set_session (this); - _state_of_the_state = Clean; Port::set_connecting_blocked (false); @@ -458,13 +466,6 @@ Session::ensure_subdirs () return -1; } - dir = session_directory().sound_stub_path().to_string(); - - if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) { - error << string_compose(_("Session: cannot create session stub 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) { @@ -472,14 +473,7 @@ Session::ensure_subdirs () return -1; } - dir = session_directory().midi_stub_path().to_string(); - - if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) { - error << string_compose(_("Session: cannot create session stub midi dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg; - return -1; - } - - dir = session_directory().dead_sound_path().to_string(); + dir = session_directory().dead_path().to_string(); if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) { error << string_compose(_("Session: cannot create session dead sounds folder \"%1\" (%2)"), dir, strerror (errno)) << endmsg; @@ -510,11 +504,12 @@ Session::ensure_subdirs () return 0; } -/** Caller must not hold process lock */ +/** @param session_template directory containing session template, or empty. + * Caller must not hold process lock. + */ int -Session::create (const string& mix_template, BusProfile* bus_profile) +Session::create (const string& session_template, BusProfile* bus_profile) { - if (g_mkdir_with_parents (_path.c_str(), 0755) < 0) { error << string_compose(_("Session: cannot create session folder \"%1\" (%2)"), _path, strerror (errno)) << endmsg; return -1; @@ -524,31 +519,39 @@ Session::create (const string& mix_template, BusProfile* bus_profile) return -1; } - if (!mix_template.empty()) { - std::string in_path = mix_template; + _writable = exists_and_writable (sys::path (_path)); + + if (!session_template.empty()) { + std::string in_path = session_template_dir_to_file (session_template); ifstream in(in_path.c_str()); - if (in){ + if (in) { string out_path = _path; out_path += _name; out_path += statefile_suffix; ofstream out(out_path.c_str()); - if (out){ + if (out) { out << in.rdbuf(); _is_new = false; + + /* Copy plugin state files from template to new session */ + sys::path template_plugins = session_template; + template_plugins /= X_("plugins"); + sys::copy_files (template_plugins, plugins_dir ()); + 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 session 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 session template %1 for reading"), in_path) << endmsg; return -1; } @@ -562,57 +565,37 @@ Session::create (const string& mix_template, BusProfile* bus_profile) /* set initial start + end point */ _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; + boost::shared_ptr r (new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO)); + if (r->init ()) { return -1; } - boost_debug_shared_ptr_mark_interesting (rt, "Route"); - boost::shared_ptr r (rt); +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); +#endif { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); 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); - { - Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); - 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); - } - } else { /* prohibit auto-connect to master, because there isn't one */ bus_profile->output_ac = AutoConnectOption (bus_profile->output_ac & ~AutoConnectMaster); } if (!rl.empty()) { - add_routes (rl, false); + add_routes (rl, false, false); } /* this allows the user to override settings with an environment variable. @@ -622,11 +605,15 @@ Session::create (const string& mix_template, BusProfile* bus_profile) 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); } + if (Config->get_use_monitor_bus() && bus_profile) { + add_monitor_section (); + } + save_state (""); return 0; @@ -659,7 +646,8 @@ Session::remove_pending_capture_state () } /** Rename a state file. - * @param snapshot_name Snapshot name. + * @param old_name Old snapshot name. + * @param new_name New snapshot name. */ void Session::rename_state (string old_name, string new_name) @@ -687,7 +675,7 @@ Session::rename_state (string old_name, string new_name) } /** Remove a state file. - * @param snapshot_name Snapshot name. + * @param snapshot_name Snapshot name. */ void Session::remove_state (string snapshot_name) @@ -726,7 +714,7 @@ Session::jack_session_event (jack_session_event_t * event) if (event->type == JackSessionSaveTemplate) { if (save_template( timebuf )) { - event->flags = JackSessionSaveError; + event->flags = JackSessionSaveError; } else { string cmd ("ardour3 -P -U "); cmd += event->client_uuid; @@ -739,7 +727,7 @@ Session::jack_session_event (jack_session_event_t * event) else { if (save_state (timebuf)) { - event->flags = JackSessionSaveError; + event->flags = JackSessionSaveError; } else { sys::path xml_path (_session_dir->root_path()); xml_path /= legalize_for_path (timebuf) + statefile_suffix; @@ -764,6 +752,7 @@ Session::jack_session_event (jack_session_event_t * event) } #endif +/** @param snapshot_name Name to save under, without .ardour / .pending prefix */ int Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot) { @@ -784,7 +773,11 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot /* 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) { - i->second->session_saved(); + try { + i->second->session_saved(); + } catch (Evoral::SMF::FileError& e) { + error << string_compose ("Could not write to MIDI file %1; MIDI data not saved.", e.file_name ()) << endmsg; + } } tree.set_root (&get_state()); @@ -827,7 +820,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot } else { - if (rename (tmp_path.to_string().c_str(), xml_path.to_string().c_str()) != 0) { + if (::rename (tmp_path.to_string().c_str(), xml_path.to_string().c_str()) != 0) { error << string_compose (_("could not rename temporary session file %1 to %2"), tmp_path.to_string(), xml_path.to_string()) << endmsg; sys::remove (tmp_path); @@ -904,14 +897,7 @@ 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; - } + _writable = exists_and_writable (xmlpath); if (!state_tree->read (xmlpath.to_string())) { error << string_compose(_("Could not understand ardour file %1"), xmlpath.to_string()) << endmsg; @@ -942,7 +928,7 @@ Session::load_state (string snapshot_name) 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()); @@ -1017,7 +1003,7 @@ Session::state(bool full_state) if (full_state) { node->add_property ("name", _name); - snprintf (buf, sizeof (buf), "%" PRId32, _nominal_frame_rate); + snprintf (buf, sizeof (buf), "%" PRId64, _nominal_frame_rate); node->add_property ("sample-rate", buf); if (session_dirs.size() > 1) { @@ -1073,20 +1059,23 @@ Session::state(bool full_state) for (SourceMap::iterator siter = sources.begin(); siter != sources.end(); ++siter) { - /* Don't save information about non-destructive file sources that are empty - and unused by any regions. + /* Don't save information about non-file Sources, or + * about non-destructive file sources that are empty + * and unused by any regions. */ boost::shared_ptr fs; + if ((fs = boost::dynamic_pointer_cast (siter->second)) != 0) { + if (!fs->destructive()) { if (fs->empty() && !fs->used()) { continue; } } - } - child->add_child_nocopy (siter->second->get_state()); + child->add_child_nocopy (siter->second->get_state()); + } } } @@ -1102,6 +1091,22 @@ Session::state(bool full_state) child->add_child_nocopy (r->state ()); } } + + RegionFactory::CompoundAssociations& cassocs (RegionFactory::compound_associations()); + + if (!cassocs.empty()) { + XMLNode* ca = node->add_child (X_("CompoundAssociations")); + + for (RegionFactory::CompoundAssociations::iterator i = cassocs.begin(); i != cassocs.end(); ++i) { + char buf[64]; + XMLNode* can = new XMLNode (X_("CompoundAssociation")); + i->first->id().print (buf, sizeof (buf)); + can->add_property (X_("copy"), buf); + i->second->id().print (buf, sizeof (buf)); + can->add_property (X_("original"), buf); + ca->add_child_nocopy (*can); + } + } } if (full_state) { @@ -1173,8 +1178,8 @@ Session::state(bool full_state) } } + node->add_child_nocopy (_speakers->get_state()); node->add_child_nocopy (_tempo_map->get_state()); - node->add_child_nocopy (get_control_protocol_state()); if (_extra_xml) { @@ -1201,7 +1206,7 @@ Session::set_state (const XMLNode& node, int version) _state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave); - if (node.name() != X_("Session")){ + if (node.name() != X_("Session")) { fatal << _("programming error: Session: incorrect XML node sent to set_state()") << endmsg; return -1; } @@ -1248,27 +1253,7 @@ Session::set_state (const XMLNode& node, int version) IO::disable_connecting (); - /* Object loading order: - - Path - Extra - Options/Config - MIDI Control // relies on data from Options/Config - Metadata - Locations - Sources - AudioRegions - Connections - Routes - RouteGroups - MixGroups - Click - ControlProtocols - */ - - if ((child = find_named_node (node, "Extra")) != 0) { - _extra_xml = new XMLNode (*child); - } + Stateful::save_extra_xml (node); if (((child = find_named_node (node, "Options")) != 0)) { /* old style */ load_options (*child); @@ -1286,6 +1271,24 @@ Session::set_state (const XMLNode& node, int version) } } + if ((child = find_named_node (node, X_("Speakers"))) != 0) { + _speakers->set_state (*child, version); + } + + if ((child = find_named_node (node, "Sources")) == 0) { + error << _("Session: XML state has no sources section") << endmsg; + goto out; + } else if (load_sources (*child)) { + 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, version)) { + goto out; + } + if ((child = find_named_node (node, "Locations")) == 0) { error << _("Session: XML state has no locations section") << endmsg; goto out; @@ -1312,13 +1315,6 @@ Session::set_state (const XMLNode& node, int version) AudioFileSource::set_header_position_offset (_session_range_location->start()); } - if ((child = find_named_node (node, "Sources")) == 0) { - error << _("Session: XML state has no sources section") << endmsg; - goto out; - } else if (load_sources (*child)) { - goto out; - } - if ((child = find_named_node (node, "Regions")) == 0) { error << _("Session: XML state has no Regions section") << endmsg; goto out; @@ -1338,7 +1334,13 @@ Session::set_state (const XMLNode& node, int version) } else if (playlists->load_unused (*this, *child)) { goto out; } - + + if ((child = find_named_node (node, "CompoundAssociations")) != 0) { + if (load_compounds (*child)) { + goto out; + } + } + if ((child = find_named_node (node, "NamedSelections")) != 0) { if (load_named_selections (*child)) { goto out; @@ -1356,13 +1358,6 @@ Session::set_state (const XMLNode& node, int version) _bundle_xml_node = new XMLNode (*child); } } - - 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, version)) { - goto out; - } if (version < 3000) { if ((child = find_named_node (node, X_("DiskStreams"))) == 0) { @@ -1384,16 +1379,16 @@ Session::set_state (const XMLNode& node, int version) _diskstreams_2X.clear (); 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; @@ -1448,7 +1443,7 @@ Session::load_routes (const XMLNode& node, int version) } else { route = XMLRouteFactory (**niter, version); } - + if (route == 0) { error << _("Session: cannot create Route from XML description.") << endmsg; return -1; @@ -1459,7 +1454,7 @@ Session::load_routes (const XMLNode& node, int version) new_routes.push_back (route); } - add_routes (new_routes, false); + add_routes (new_routes, false, false); return 0; } @@ -1486,36 +1481,35 @@ Session::XMLRouteFactory (const XMLNode& node, int version) if (ds_child) { - Track* track; - + boost::shared_ptr track; + if (type == DataType::AUDIO) { - track = new AudioTrack (*this, X_("toBeResetFroXML")); - + track.reset (new AudioTrack (*this, X_("toBeResetFroXML"))); } else { - track = new MidiTrack (*this, X_("toBeResetFroXML")); + track.reset (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); - + +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); +#endif + ret = track; + } else { - Route* rt = new Route (*this, X_("toBeResetFroXML")); + boost::shared_ptr r (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; + if (r->init () == 0 && r->set_state (node, version) == 0) { +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); +#endif + ret = r; } } @@ -1557,38 +1551,37 @@ Session::XMLRouteFactory_2X (const XMLNode& node, int version) return boost::shared_ptr (); } - Track* track; - + boost::shared_ptr track; + if (type == DataType::AUDIO) { - track = new AudioTrack (*this, X_("toBeResetFroXML")); - + track.reset (new AudioTrack (*this, X_("toBeResetFroXML"))); } else { - track = new MidiTrack (*this, X_("toBeResetFroXML")); + track.reset (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); - + +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (track.get(), "Track"); +#endif + ret = track; + } else { - Route* rt = new Route (*this, X_("toBeResetFroXML")); + boost::shared_ptr r (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; + if (r->init () == 0 && r->set_state (node, version) == 0) { +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (r.get(), "Route"); +#endif + ret = r; } } @@ -1622,6 +1615,79 @@ Session::load_regions (const XMLNode& node) return 0; } +int +Session::load_compounds (const XMLNode& node) +{ + XMLNodeList calist = node.children(); + XMLNodeConstIterator caiter; + XMLProperty *caprop; + + for (caiter = calist.begin(); caiter != calist.end(); ++caiter) { + XMLNode* ca = *caiter; + ID orig_id; + ID copy_id; + + if ((caprop = ca->property (X_("original"))) == 0) { + continue; + } + orig_id = caprop->value(); + + if ((caprop = ca->property (X_("copy"))) == 0) { + continue; + } + copy_id = caprop->value(); + + boost::shared_ptr orig = RegionFactory::region_by_id (orig_id); + boost::shared_ptr copy = RegionFactory::region_by_id (copy_id); + + if (!orig || !copy) { + warning << string_compose (_("Regions in compound description not found (ID's %1 and %2): ignored"), + orig_id, copy_id) + << endmsg; + continue; + } + + RegionFactory::add_compound_association (orig, copy); + } + + return 0; +} + +void +Session::load_nested_sources (const XMLNode& node) +{ + XMLNodeList nlist; + XMLNodeConstIterator niter; + + nlist = node.children(); + + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { + if ((*niter)->name() == "Source") { + + /* it may already exist, so don't recreate it unnecessarily + */ + + XMLProperty* prop = (*niter)->property (X_("id")); + if (!prop) { + error << _("Nested source has no ID info in session state file! (ignored)") << endmsg; + continue; + } + + ID source_id (prop->value()); + + if (!source_by_id (source_id)) { + + try { + SourceFactory::create (*this, **niter, true); + } + catch (failed_constructor& err) { + error << string_compose (_("Cannot reconstruct nested source for region %1"), name()) << endmsg; + } + } + } + } +} + boost::shared_ptr Session::XMLRegionFactory (const XMLNode& node, bool full) { @@ -1629,6 +1695,15 @@ Session::XMLRegionFactory (const XMLNode& node, bool full) try { + const XMLNodeList& nlist = node.children(); + + for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) { + XMLNode *child = (*niter); + if (child->name() == "NestedSource") { + load_nested_sources (*child); + } + } + if (!type || type->value() == "audio") { return boost::shared_ptr(XMLAudioRegionFactory (node, full)); } else if (type->value() == "midi") { @@ -1902,8 +1977,8 @@ Session::load_sources (const XMLNode& node) case 0: /* user added a new search location, so try again */ goto retry; - - + + case 1: /* user asked to quit the entire session load */ @@ -1964,66 +2039,43 @@ Session::save_template (string template_name) } catch(sys::filesystem_error& ex) { - error << string_compose(_("Could not create mix templates directory \"%1\" (%2)"), + error << string_compose(_("Could not create templates directory \"%1\" (%2)"), user_template_dir.to_string(), ex.what()) << endmsg; return -1; } tree.set_root (&get_template()); - sys::path template_file_path(user_template_dir); - template_file_path /= template_name + template_suffix; - - if (sys::exists (template_file_path)) + sys::path template_dir_path(user_template_dir); + + /* directory to put the template in */ + template_dir_path /= template_name; + if (sys::exists (template_dir_path)) { warning << string_compose(_("Template \"%1\" already exists - new version not created"), - template_file_path.to_string()) << endmsg; - return -1; - } - - if (!tree.write (template_file_path.to_string())) { - error << _("mix template not saved") << endmsg; + template_dir_path.to_string()) << endmsg; return -1; } + + sys::create_directories (template_dir_path); - return 0; -} - -int -Session::rename_template (string old_name, string new_name) -{ - sys::path old_path (user_template_directory()); - old_path /= old_name + template_suffix; - - sys::path new_path(user_template_directory()); - new_path /= new_name + template_suffix; + /* file to write */ + sys::path template_file_path = template_dir_path; + template_file_path /= template_name + template_suffix; - if (sys::exists (new_path)) { - warning << string_compose(_("Template \"%1\" already exists - template not renamed"), - new_path.to_string()) << endmsg; + if (!tree.write (template_file_path.to_string())) { + error << _("template not saved") << endmsg; return -1; } - try { - sys::rename (old_path, new_path); - return 0; - } catch (...) { - return -1; - } -} + /* copy plugin state directory */ -int -Session::delete_template (string name) -{ - sys::path path = user_template_directory(); - path /= name + template_suffix; + sys::path template_plugin_state_path = template_dir_path; + template_plugin_state_path /= X_("plugins"); + sys::create_directories (template_plugin_state_path); + sys::copy_files (plugins_dir(), template_plugin_state_path); - try { - sys::remove (path); - return 0; - } catch (...) { - return -1; - } + return 0; } void @@ -2228,7 +2280,7 @@ Session::load_route_groups (const XMLNode& node, int version) set_dirty (); if (version >= 3000) { - + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { if ((*niter)->name() == "RouteGroup") { RouteGroup* rg = new RouteGroup (*this, ""); @@ -2313,9 +2365,10 @@ Session::add_route_group (RouteGroup* g) _route_groups.push_back (g); route_group_added (g); /* EMIT SIGNAL */ - g->MembershipChanged.connect_same_thread (*this, boost::bind (&Session::route_group_changed, this)); - g->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::route_group_changed, this)); - + g->RouteAdded.connect_same_thread (*this, boost::bind (&Session::route_added_to_route_group, this, _1, _2)); + g->RouteRemoved.connect_same_thread (*this, boost::bind (&Session::route_removed_from_route_group, this, _1, _2)); + g->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::route_group_property_changed, this, g)); + set_dirty (); } @@ -2330,9 +2383,21 @@ Session::remove_route_group (RouteGroup& rg) route_group_removed (); /* EMIT SIGNAL */ } +} +/** Set a new order for our route groups, without adding or removing any. + * @param groups Route group list in the new order. + */ +void +Session::reorder_route_groups (list groups) +{ + _route_groups = groups; + + route_groups_reordered (); /* EMIT SIGNAL */ + set_dirty (); } + RouteGroup * Session::route_group_by_name (string name) { @@ -2352,23 +2417,6 @@ Session::all_route_group() const return *_all_route_group; } -UndoTransaction* -Session::start_reversible_command (const string& name) -{ - UndoTransaction* trans = new UndoTransaction(); - trans->set_name(name); - return trans; -} - -void -Session::finish_reversible_command (UndoTransaction& ut) -{ - struct timeval now; - gettimeofday(&now, 0); - ut.set_timestamp(now); - _history.add (&ut); -} - void Session::add_commands (vector const & cmds) { @@ -2378,53 +2426,99 @@ Session::add_commands (vector const & cmds) } void -Session::begin_reversible_command(const string& name) +Session::begin_reversible_command (const string& name) { - UndoTransaction* trans = new UndoTransaction(); - trans->set_name(name); + begin_reversible_command (g_quark_from_string (name.c_str ())); +} - if (!_current_trans.empty()) { - _current_trans.top()->add_command (trans); - } else { - _current_trans.push(trans); +/** Begin a reversible command using a GQuark to identify it. + * begin_reversible_command() and commit_reversible_command() calls may be nested, + * but there must be as many begin...()s as there are commit...()s. + */ +void +Session::begin_reversible_command (GQuark q) +{ + /* If nested begin/commit pairs are used, we create just one UndoTransaction + to hold all the commands that are committed. This keeps the order of + commands correct in the history. + */ + + if (_current_trans == 0) { + /* start a new transaction */ + assert (_current_trans_quarks.empty ()); + _current_trans = new UndoTransaction(); + _current_trans->set_name (g_quark_to_string (q)); } + + _current_trans_quarks.push_front (q); } void -Session::commit_reversible_command(Command *cmd) +Session::commit_reversible_command (Command *cmd) { - assert(!_current_trans.empty()); + assert (_current_trans); + assert (!_current_trans_quarks.empty ()); + struct timeval now; if (cmd) { - _current_trans.top()->add_command(cmd); + _current_trans->add_command (cmd); } - if (_current_trans.top()->empty()) { - _current_trans.pop(); + _current_trans_quarks.pop_front (); + + if (!_current_trans_quarks.empty ()) { + /* the transaction we're committing is not the top-level one */ + return; + } + + if (_current_trans->empty()) { + /* no commands were added to the transaction, so just get rid of it */ + delete _current_trans; + _current_trans = 0; return; } - gettimeofday(&now, 0); - _current_trans.top()->set_timestamp(now); + gettimeofday (&now, 0); + _current_trans->set_timestamp (now); - _history.add(_current_trans.top()); - _current_trans.pop(); + _history.add (_current_trans); + _current_trans = 0; } static bool -accept_all_non_peak_files (const string& path, void */*arg*/) +accept_all_audio_files (const string& path, void */*arg*/) { if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) { return false; } - return (path.length() > 5 && path.find (peakfile_suffix) != (path.length() - 5)); + if (!AudioFileSource::safe_audio_file_extension (path)) { + return false; + } + + return true; +} + +static bool +accept_all_midi_files (const string& path, void */*arg*/) +{ + if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) { + return false; + } + + return ((path.length() > 4 && path.find (".mid") != (path.length() - 4)) || + (path.length() > 4 && path.find (".smf") != (path.length() - 4)) || + (path.length() > 5 && path.find (".midi") != (path.length() - 5))); } static bool accept_all_state_files (const string& path, void */*arg*/) { + if (!Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) { + return false; + } + return (path.length() > 7 && path.find (".ardour") == (path.length() - 7)); } @@ -2537,6 +2631,26 @@ Session::ask_about_playlist_deletion (boost::shared_ptr p) return r.get_value_or (1); } +void +Session::cleanup_regions () +{ + const RegionFactory::RegionMap& regions (RegionFactory::regions()); + + for (RegionFactory::RegionMap::const_iterator i = regions.begin(); i != regions.end(); ++i) { + + uint32_t used = playlists->region_use_count (i->second); + + if (used == 0 && !i->second->automatic ()) { + RegionFactory::map_remove (i->second); + } + } + + /* dump the history list */ + _history.clear (); + + save_state (""); +} + int Session::cleanup_sources (CleanupReport& rep) { @@ -2544,10 +2658,12 @@ Session::cleanup_sources (CleanupReport& rep) vector > dead_sources; PathScanner scanner; - string sound_path; + string audio_path; + string midi_path; vector::iterator i; vector::iterator nexti; - vector* soundfiles; + vector* candidates; + vector* candidates2; vector unused; set all_sources; bool used; @@ -2556,14 +2672,19 @@ Session::cleanup_sources (CleanupReport& rep) _state_of_the_state = (StateOfTheState) (_state_of_the_state | InCleanup); - /* step 1: consider deleting all unused playlists */ - + /* consider deleting all unused playlists */ + if (playlists->maybe_delete_unused (boost::bind (Session::ask_about_playlist_deletion, _1))) { ret = 0; goto out; } - /* step 2: find all un-used sources */ + /* sync the "all regions" property of each playlist with its current state + */ + + playlists->sync_all_regions_with_regions (); + + /* find all un-used sources */ rep.paths.clear (); rep.space = 0; @@ -2587,7 +2708,7 @@ Session::cleanup_sources (CleanupReport& rep) i = tmp; } - /* build a list of all the possible sound directories for the session */ + /* build a list of all the possible audio directories for the session */ for (i = session_dirs.begin(); i != session_dirs.end(); ) { @@ -2595,25 +2716,49 @@ Session::cleanup_sources (CleanupReport& rep) ++nexti; SessionDirectory sdir ((*i).path); - sound_path += sdir.sound_path().to_string(); + audio_path += sdir.sound_path().to_string(); if (nexti != session_dirs.end()) { - sound_path += ':'; + audio_path += ':'; } i = nexti; } - /* 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. - */ - soundfiles = scanner (sound_path, accept_all_non_peak_files, (void *) 0, false, true); + /* build a list of all the possible midi directories for the session */ - if (soundfiles == 0) { - return 0; + for (i = session_dirs.begin(); i != session_dirs.end(); ) { + + nexti = i; + ++nexti; + + SessionDirectory sdir ((*i).path); + midi_path += sdir.midi_path().to_string(); + + if (nexti != session_dirs.end()) { + midi_path += ':'; + } + + i = nexti; } + candidates = scanner (audio_path, accept_all_audio_files, (void *) 0, true, true); + candidates2 = scanner (midi_path, accept_all_midi_files, (void *) 0, true, true); + + /* merge them */ + + if (candidates) { + if (candidates2) { + for (vector::iterator i = candidates2->begin(); i != candidates2->end(); ++i) { + candidates->push_back (*i); + } + delete candidates2; + } + } else { + candidates = candidates2; // might still be null + } + /* find all sources, but don't use this snapshot because the state file on disk still references sources we may have already dropped. @@ -2624,61 +2769,78 @@ Session::cleanup_sources (CleanupReport& rep) /* add our current source list */ - for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) { + for (SourceMap::iterator i = sources.begin(); i != sources.end(); ) { boost::shared_ptr fs; + SourceMap::iterator tmp = i; + ++tmp; if ((fs = boost::dynamic_pointer_cast (i->second)) != 0) { - all_sources.insert (fs->path()); + if (playlists->source_use_count (fs) != 0) { + all_sources.insert (fs->path()); + } else { + + /* we might not remove this source from disk, because it may be used + by other snapshots, but its not being used in this version + so lets get rid of it now, along with any representative regions + in the region list. + */ + + RegionFactory::remove_regions_using_source (i->second); + sources.erase (i); + } } + + i = tmp; } char tmppath1[PATH_MAX+1]; char tmppath2[PATH_MAX+1]; - for (vector::iterator x = soundfiles->begin(); x != soundfiles->end(); ++x) { + if (candidates) { + for (vector::iterator x = candidates->begin(); x != candidates->end(); ++x) { + + used = false; + spath = **x; - used = false; - spath = **x; + for (set::iterator i = all_sources.begin(); i != all_sources.end(); ++i) { - for (set::iterator i = all_sources.begin(); i != all_sources.end(); ++i) { + if (realpath(spath.c_str(), tmppath1) == 0) { + error << string_compose (_("Cannot expand path %1 (%2)"), + spath, strerror (errno)) << endmsg; + continue; + } - if (realpath(spath.c_str(), tmppath1) == 0) { - error << string_compose (_("Cannot expand path %1 (%2)"), - spath, strerror (errno)) << endmsg; - continue; + if (realpath((*i).c_str(), tmppath2) == 0) { + error << string_compose (_("Cannot expand path %1 (%2)"), + (*i), strerror (errno)) << endmsg; + continue; + } + + if (strcmp(tmppath1, tmppath2) == 0) { + used = true; + break; + } } - if (realpath((*i).c_str(), tmppath2) == 0) { - error << string_compose (_("Cannot expand path %1 (%2)"), - (*i), strerror (errno)) << endmsg; - continue; + if (!used) { + unused.push_back (spath); } - if (strcmp(tmppath1, tmppath2) == 0) { - used = true; - break; - } - } + delete *x; + } - if (!used) { - unused.push_back (spath); - } - } + delete candidates; + } - /* now try to move all unused files into the "dead_sounds" directory(ies) */ + /* now try to move all unused files into the "dead" directory(ies) */ for (vector::iterator x = unused.begin(); x != unused.end(); ++x) { struct stat statbuf; - rep.paths.push_back (*x); - if (stat ((*x).c_str(), &statbuf) == 0) { - rep.space += statbuf.st_size; - } - string newpath; /* don't move the file across filesystems, just - stick it in the `dead_sound_dir_name' directory + stick it in the `dead_dir_name' directory on whichever filesystem it was already on. */ @@ -2693,21 +2855,21 @@ Session::cleanup_sources (CleanupReport& rep) /* new school, go up 4 levels */ - newpath = Glib::path_get_dirname (*x); // "audiofiles" + newpath = Glib::path_get_dirname (*x); // "audiofiles" or "midifiles" newpath = Glib::path_get_dirname (newpath); // "session-name" newpath = Glib::path_get_dirname (newpath); // "interchange" newpath = Glib::path_get_dirname (newpath); // "session-dir" } - newpath = Glib::build_filename (newpath, dead_sound_dir_name); + newpath = Glib::build_filename (newpath, dead_dir_name); if (g_mkdir_with_parents (newpath.c_str(), 0755) < 0) { - error << string_compose(_("Session: cannot create session peakfile folder \"%1\" (%2)"), newpath, strerror (errno)) << endmsg; + error << string_compose(_("Session: cannot create dead file folder \"%1\" (%2)"), newpath, strerror (errno)) << endmsg; return -1; } newpath = Glib::build_filename (newpath, Glib::path_get_basename ((*x))); - + if (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS)) { /* the new path already exists, try versioning */ @@ -2719,7 +2881,7 @@ Session::cleanup_sources (CleanupReport& rep) snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), version); newpath_v = buf; - while (access (newpath_v.c_str(), F_OK) == 0 && version < 999) { + while (Glib::file_test (newpath_v.c_str(), Glib::FILE_TEST_EXISTS) && version < 999) { snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), ++version); newpath_v = buf; } @@ -2738,8 +2900,10 @@ Session::cleanup_sources (CleanupReport& rep) } + stat ((*x).c_str(), &statbuf); + if (::rename ((*x).c_str(), newpath.c_str()) != 0) { - error << string_compose (_("cannot rename audio file source from %1 to %2 (%3)"), + error << string_compose (_("cannot rename unused file source from %1 to %2 (%3)"), (*x), newpath, strerror (errno)) << endmsg; goto out; @@ -2748,22 +2912,27 @@ Session::cleanup_sources (CleanupReport& rep) /* see if there an easy to find peakfile for this file, and remove it. */ - string peakpath = (*x).substr (0, (*x).find_last_of ('.')); - peakpath += peakfile_suffix; + string base = basename_nosuffix (*x); + base += "%A"; /* this is what we add for the channel suffix of all native files, + or for the first channel of embedded files. it will miss + some peakfiles for other channels + */ + string peakpath = peak_path (base); - if (access (peakpath.c_str(), W_OK) == 0) { + if (Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) { if (::unlink (peakpath.c_str()) != 0) { error << string_compose (_("cannot remove peakfile %1 for %2 (%3)"), - peakpath, _path, strerror (errno)) + peakpath, _path, strerror (errno)) << endmsg; /* try to back out */ - rename (newpath.c_str(), _path.c_str()); + ::rename (newpath.c_str(), _path.c_str()); goto out; } } - } - ret = 0; + rep.paths.push_back (*x); + rep.space += statbuf.st_size; + } /* dump the history list */ @@ -2774,6 +2943,7 @@ Session::cleanup_sources (CleanupReport& rep) */ save_state (""); + ret = 0; out: _state_of_the_state = (StateOfTheState) (_state_of_the_state & ~InCleanup); @@ -2787,61 +2957,21 @@ Session::cleanup_trash_sources (CleanupReport& rep) // FIXME: needs adaptation for MIDI vector::iterator i; - string dead_sound_dir; + string dead_dir; rep.paths.clear (); 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; + dead_dir = Glib::build_filename ((*i).path, dead_dir_name); - clear_directory (dead_sound_dir, &rep.space, &rep.paths); + clear_directory (dead_dir, &rep.space, &rep.paths); } return 0; } -void -Session::cleanup_stubfiles () -{ - vector::iterator i; - - for (i = session_dirs.begin(); i != session_dirs.end(); ++i) { - - string dir; - string lname = legalize_for_path (_name); - - vector v; - - /* XXX this is a hack caused by semantic conflicts - between space_and_path and the SessionDirectory concept. - */ - - v.push_back ((*i).path); - v.push_back ("interchange"); - v.push_back (lname); - v.push_back ("audiofiles"); - v.push_back (stub_dir_name); - - dir = Glib::build_filename (v); - - clear_directory (dir); - - v.clear (); - v.push_back ((*i).path); - v.push_back ("interchange"); - v.push_back (lname); - v.push_back ("midifiles"); - v.push_back (stub_dir_name); - - dir = Glib::build_filename (v); - - clear_directory (dir); - } -} - void Session::set_dirty () { @@ -2950,7 +3080,7 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc) r = route_by_remote_id (desc.rid()); break; } - + if (!r) { return c; } @@ -2961,7 +3091,7 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc) break; case ControllableDescriptor::Solo: - c = r->solo_control(); + c = r->solo_control(); break; case ControllableDescriptor::Mute: @@ -2971,7 +3101,7 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc) case ControllableDescriptor::Recenable: { boost::shared_ptr t = boost::dynamic_pointer_cast(r); - + if (t) { c = t->rec_enable_control (); } @@ -2980,19 +3110,19 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc) case ControllableDescriptor::PanDirection: { - boost::shared_ptr p = r->panner(); - if (p) { - c = p->direction_control(); - } + c = r->pannable()->pan_azimuth_control; break; } case ControllableDescriptor::PanWidth: { - boost::shared_ptr p = r->panner(); - if (p) { - c = p->width_control(); - } + c = r->pannable()->pan_width_control; + break; + } + + case ControllableDescriptor::PanElevation: + { + c = r->pannable()->pan_elevation_control; break; } @@ -3006,17 +3136,17 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc) 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))); @@ -3024,18 +3154,18 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc) break; } - case ControllableDescriptor::SendGain: + 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(); @@ -3186,14 +3316,36 @@ Session::restore_history (string snapshot_name) ut->add_command(c); } - } else if (n->name() == "DiffCommand") { - PBD::ID id(n->property("midi-source")->value()); + } else if (n->name() == "NoteDiffCommand") { + 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::NoteDiffCommand(midi_source->model(), *n)); + } else { + error << _("Failed to downcast MidiSource for NoteDiffCommand") << endmsg; + } + + } else if (n->name() == "SysExDiffCommand") { + + 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::SysExDiffCommand (midi_source->model(), *n)); + } else { + error << _("Failed to downcast MidiSource for SysExDiffCommand") << endmsg; + } + + } else if (n->name() == "PatchChangeDiffCommand") { + + 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)); + ut->add_command (new MidiModel::PatchChangeDiffCommand (midi_source->model(), *n)); } else { - error << _("Failed to downcast MidiSource for DiffCommand") << endmsg; + error << _("Failed to downcast MidiSource for PatchChangeDiffCommand") << endmsg; } } else if (n->name() == "StatefulDiffCommand") { @@ -3228,14 +3380,7 @@ 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 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()); - } - } + set_track_monitor_input_status (!config.get_auto_input()); } } else if (p == "punch-in") { @@ -3280,11 +3425,11 @@ Session::config_changed (std::string p, bool ours) //poke_midi_thread (); - } else if (p == "mmc-device-id" || p == "mmc-receive-id") { + } else if (p == "mmc-device-id" || p == "mmc-receive-id" || p == "mmc-receive-device-id") { MIDI::Manager::instance()->mmc()->set_receive_device_id (Config->get_mmc_receive_device_id()); - } else if (p == "mmc-send-id") { + } else if (p == "mmc-send-id" || p == "mmc-send-device-id") { MIDI::Manager::instance()->mmc()->set_send_device_id (Config->get_mmc_send_device_id()); @@ -3336,8 +3481,7 @@ Session::config_changed (std::string p, bool ours) } else if (p == "send-mtc") { - session_send_mtc = Config->get_send_mtc(); - if (session_send_mtc) { + if (Config->get_send_mtc ()) { /* mark us ready to send */ next_quarter_frame_to_send = 0; } @@ -3396,12 +3540,14 @@ Session::config_changed (std::string p, bool ours) } } else if (p == "solo-mute-override") { // catch_up_on_solo_mute_override (); - } else if (p == "listen-position") { + } else if (p == "listen-position" || p == "pfl-position") { listen_position_changed (); } else if (p == "solo-control-is-listen-control") { solo_control_mode_changed (); } 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()); } set_dirty (); @@ -3447,7 +3593,7 @@ void Session::setup_midi_machine_control () { MIDI::MachineControl* mmc = MIDI::Manager::instance()->mmc (); - + mmc->Play.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1)); mmc->DeferredPlay.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1)); mmc->Stop.connect_same_thread (*this, boost::bind (&Session::mmc_stop, this, _1)); @@ -3468,3 +3614,185 @@ Session::setup_midi_machine_control () mmc->SPPContinue.connect_same_thread (*this, boost::bind (&Session::spp_continue, this, _1, _2)); mmc->SPPStop.connect_same_thread (*this, boost::bind (&Session::spp_stop, this, _1, _2)); } + +boost::shared_ptr +Session::solo_cut_control() const +{ + /* the solo cut control is a bit of an anomaly, at least as of Febrary 2011. There are no other + controls in Ardour that currently get presented to the user in the GUI that require + access as a Controllable and are also NOT owned by some SessionObject (e.g. Route, or MonitorProcessor). + + its actually an RCConfiguration parameter, so we use a ProxyControllable to wrap + it up as a Controllable. Changes to the Controllable will just map back to the RCConfiguration + parameter. + */ + + return _solo_cut_control; +} + +int +Session::rename (const std::string& new_name) +{ + string legal_name = legalize_for_path (new_name); + string newpath; + string oldstr; + string newstr; + bool first = true; + + string const old_sources_root = _session_dir->sources_root().to_string (); + +#define RENAME ::rename + + /* Rename: + + * session directory + * interchange subdirectory + * session file + * session history + + * Backup files are left unchanged and not renamed. + */ + + /* pass one: not 100% safe check that the new directory names don't + * already exist ... + */ + + for (vector::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) { + vector v; + + oldstr = (*i).path; + + /* this is a stupid hack because Glib::path_get_dirname() is + * lexical-only, and so passing it /a/b/c/ gives a different + * result than passing it /a/b/c ... + */ + + if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) { + oldstr = oldstr.substr (0, oldstr.length() - 1); + } + + string base = Glib::path_get_dirname (oldstr); + string p = Glib::path_get_basename (oldstr); + + newstr = Glib::build_filename (base, legal_name); + + if (Glib::file_test (newstr, Glib::FILE_TEST_EXISTS)) { + return -1; + } + } + + /* Session dirs */ + + for (vector::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) { + vector v; + + oldstr = (*i).path; + + /* this is a stupid hack because Glib::path_get_dirname() is + * lexical-only, and so passing it /a/b/c/ gives a different + * result than passing it /a/b/c ... + */ + + if (oldstr[oldstr.length()-1] == G_DIR_SEPARATOR) { + oldstr = oldstr.substr (0, oldstr.length() - 1); + } + + string base = Glib::path_get_dirname (oldstr); + string p = Glib::path_get_basename (oldstr); + + newstr = Glib::build_filename (base, legal_name); + + cerr << "Rename " << oldstr << " => " << newstr << endl; + + if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) { + return 1; + } + + if (first) { + (*_session_dir) = newstr; + newpath = newstr; + first = 1; + } + + /* directory below interchange */ + + v.push_back (newstr); + v.push_back (interchange_dir_name); + v.push_back (p); + + oldstr = Glib::build_filename (v); + + v.clear (); + v.push_back (newstr); + v.push_back (interchange_dir_name); + v.push_back (legal_name); + + newstr = Glib::build_filename (v); + + cerr << "Rename " << oldstr << " => " << newstr << endl; + + if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) { + return 1; + } + } + + /* state file */ + + oldstr = Glib::build_filename (newpath, _current_snapshot_name) + statefile_suffix; + newstr= Glib::build_filename (newpath, legal_name) + statefile_suffix; + + cerr << "Rename " << oldstr << " => " << newstr << endl; + + if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) { + return 1; + } + + /* history file */ + + + oldstr = Glib::build_filename (newpath, _current_snapshot_name) + history_suffix; + + if (Glib::file_test (oldstr, Glib::FILE_TEST_EXISTS)) { + newstr = Glib::build_filename (newpath, legal_name) + history_suffix; + + cerr << "Rename " << oldstr << " => " << newstr << endl; + + if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) { + return 1; + } + } + + /* update file source paths */ + + for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) { + boost::shared_ptr fs = boost::dynamic_pointer_cast (i->second); + if (fs) { + string p = fs->path (); + boost::replace_all (p, old_sources_root, _session_dir->sources_root().to_string ()); + fs->set_path (p); + } + } + + /* remove old name from recent sessions */ + + remove_recent_sessions (_path); + + _path = newpath; + _current_snapshot_name = new_name; + _name = new_name; + + set_dirty (); + + /* save state again to get everything just right */ + + save_state (_current_snapshot_name); + + + /* add to recent sessions */ + + store_recent_sessions (new_name, _path); + + return 0; + +#undef RENAME +}