X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_state.cc;h=22a9100b319e602d65e27010bf02d51ea7fcad30;hb=7ed95f7c37c17d9d13fa1126d5117a17f1906637;hp=86a317d1d120227d9cb03d2c18f51081a40e8926;hpb=acdc88f279760443dc7397290e9c4752af5b23c9;p=ardour.git diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 86a317d1d1..22a9100b31 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -30,7 +30,6 @@ #include #include -#include #include /* snprintf(3) ... grrr */ #include @@ -58,12 +57,16 @@ #include "midi++/port.h" #include "pbd/boost_debug.h" +#include "pbd/controllable_descriptor.h" +#include "pbd/enumwriter.h" #include "pbd/error.h" #include "pbd/pathscanner.h" #include "pbd/pthread_utils.h" #include "pbd/search_path.h" #include "pbd/stacktrace.h" +#include "pbd/convert.h" +#include "ardour/amp.h" #include "ardour/audio_diskstream.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" @@ -88,7 +91,6 @@ #include "ardour/midi_source.h" #include "ardour/midi_track.h" #include "ardour/named_selection.h" -#include "ardour/playlist_factory.h" #include "ardour/processor.h" #include "ardour/region_factory.h" #include "ardour/route_group.h" @@ -97,6 +99,7 @@ #include "ardour/session_directory.h" #include "ardour/session_metadata.h" #include "ardour/session_state_utils.h" +#include "ardour/session_playlists.h" #include "ardour/session_utils.h" #include "ardour/silentfilesource.h" #include "ardour/slave.h" @@ -111,6 +114,7 @@ #include "ardour/utils.h" #include "ardour/utils.h" #include "ardour/version.h" +#include "ardour/playlist_factory.h" #include "control_protocol/control_protocol.h" @@ -143,10 +147,8 @@ Session::first_stage_init (string fullpath, string snapshot_name) } if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS) && ::access (_path.c_str(), W_OK)) { - cerr << "Session non-writable based on " << _path << endl; _writable = false; } else { - cerr << "Session writable based on " << _path << endl; _writable = true; } @@ -163,7 +165,7 @@ Session::first_stage_init (string fullpath, string snapshot_name) _base_frame_rate = _current_frame_rate; _tempo_map = new TempoMap (_current_frame_rate); - _tempo_map->StateChanged.connect (mem_fun (*this, &Session::tempo_map_changed)); + _tempo_map->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1)); _non_soloed_outs_muted = false; @@ -208,7 +210,6 @@ Session::first_stage_init (string fullpath, string snapshot_name) g_atomic_int_set (&_capture_load_min, 100); _play_range = false; _exporting = false; - _exporting_realtime = false; _gain_automation_buffer = 0; _pan_automation_buffer = 0; _npan_buffers = 0; @@ -217,7 +218,7 @@ Session::first_stage_init (string fullpath, string snapshot_name) first_file_data_format_reset = true; first_file_header_format_reset = true; post_export_sync = false; - //midi_thread = (pthread_t) 0; + midi_control_ui = 0; AudioDiskstream::allocate_working_buffers(); @@ -263,22 +264,17 @@ Session::first_stage_init (string fullpath, string snapshot_name) average_slave_delta = 1800; // !!! why 1800 ???? have_first_delta_accumulator = false; delta_accumulator_cnt = 0; - slave_state = Stopped; + _slave_state = Stopped; - _engine.GraphReordered.connect (mem_fun (*this, &Session::graph_reordered)); + _engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this)); /* These are all static "per-class" signals */ - RegionFactory::CheckNewRegion.connect (mem_fun (*this, &Session::add_region)); - SourceFactory::SourceCreated.connect (mem_fun (*this, &Session::add_source)); - PlaylistFactory::PlaylistCreated.connect (mem_fun (*this, &Session::add_playlist)); - Processor::ProcessorCreated.connect (mem_fun (*this, &Session::add_processor)); - NamedSelection::NamedSelectionCreated.connect (mem_fun (*this, &Session::add_named_selection)); - AutomationList::AutomationListCreated.connect (mem_fun (*this, &Session::add_automation_list)); - - Controllable::Destroyed.connect (mem_fun (*this, &Session::remove_controllable)); - - IO::PortCountChanged.connect (mem_fun (*this, &Session::ensure_buffers)); + SourceFactory::SourceCreated.connect_same_thread (*this, boost::bind (&Session::add_source, this, _1)); + PlaylistFactory::PlaylistCreated.connect_same_thread (*this, boost::bind (&Session::add_playlist, this, _1, _2)); + AutomationList::AutomationListCreated.connect_same_thread (*this, boost::bind (&Session::add_automation_list, this, _1)); + Controllable::Destroyed.connect_same_thread (*this, boost::bind (&Session::remove_controllable, this, _1)); + IO::PortCountChanged.connect_same_thread (*this, boost::bind (&Session::ensure_buffers, this, _1)); /* stop IO objects from doing stuff until we're ready for them */ @@ -287,11 +283,11 @@ Session::first_stage_init (string fullpath, string snapshot_name) } int -Session::second_stage_init (bool new_session) +Session::second_stage_init () { AudioFileSource::set_peak_dir (_session_dir->peak_path().to_string()); - if (!new_session) { + if (!_is_new) { if (load_state (_current_snapshot_name)) { return -1; } @@ -330,18 +326,18 @@ Session::second_stage_init (bool new_session) _state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave|Loading); - _locations.changed.connect (mem_fun (this, &Session::locations_changed)); - _locations.added.connect (mem_fun (this, &Session::locations_added)); + _locations.changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this)); + _locations.added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1)); setup_click_sounds (0); setup_midi_control (); /* Pay attention ... */ - _engine.Halted.connect (mem_fun (*this, &Session::engine_halted)); - _engine.Xrun.connect (mem_fun (*this, &Session::xrun_recovery)); + _engine.Halted.connect_same_thread (*this, boost::bind (&Session::engine_halted, this)); + _engine.Xrun.connect_same_thread (*this, boost::bind (&Session::xrun_recovery, this)); try { - when_engine_running(); + when_engine_running (); } /* handle this one in a different way than all others, so that its clear what happened */ @@ -362,16 +358,16 @@ Session::second_stage_init (bool new_session) deliver_mmc (MIDI::MachineControl::cmdMmcReset, 0); deliver_mmc (MIDI::MachineControl::cmdLocate, 0); - MidiClockTicker::instance().set_session(*this); - MIDI::Name::MidiPatchManager::instance().set_session(*this); + MidiClockTicker::instance().set_session (this); + MIDI::Name::MidiPatchManager::instance().set_session (this); /* initial program change will be delivered later; see ::config_changed() */ BootMessage (_("Reset Control Protocols")); - ControlProtocolManager::instance().set_session (*this); + ControlProtocolManager::instance().set_session (this); - config.set_end_marker_is_free (new_session); + config.set_end_marker_is_free (_is_new); _state_of_the_state = Clean; @@ -497,7 +493,7 @@ Session::ensure_subdirs () } int -Session::create (bool& new_session, const string& mix_template, nframes_t initial_length) +Session::create (const string& mix_template, nframes_t initial_length, BusProfile* bus_profile) { if (g_mkdir_with_parents (_path.c_str(), 0755) < 0) { @@ -509,8 +505,6 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia return -1; } - /* check new_session so we don't overwrite an existing one */ - if (!mix_template.empty()) { std::string in_path = mix_template; @@ -525,11 +519,6 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia if (out){ out << in.rdbuf(); - - // okay, session is set up. Treat like normal saved - // session from now on. - - new_session = false; return 0; } else { @@ -559,6 +548,64 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia _locations.add (end_location); _state_of_the_state = Clean; + + /* set up Master Out and Control Out if necessary */ + + if (bus_profile) { + + RouteList rl; + int control_id = 1; + ChanCount count(DataType::AUDIO, bus_profile->master_out_channels); + + if (bus_profile->master_out_channels) { + Route* rt = new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO); + if (rt->init ()) { + delete rt; + return -1; + } + boost_debug_shared_ptr_mark_interesting (rt, "Route"); + boost::shared_ptr r (rt); + r->input()->ensure_io (count, false, this); + r->output()->ensure_io (count, false, this); + r->set_remote_control_id (control_id++); + + rl.push_back (r); + + if (Config->get_use_monitor_bus()) { + Route* rt = new Route (*this, _("monitor"), Route::MonitorOut, DataType::AUDIO); + if (rt->init ()) { + delete rt; + return -1; + } + boost_debug_shared_ptr_mark_interesting (rt, "Route"); + boost::shared_ptr r (rt); + r->input()->ensure_io (count, false, this); + r->output()->ensure_io (count, false, this); + r->set_remote_control_id (control_id); + + rl.push_back (r); + } + + } 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); + } + + /* this allows the user to override settings with an environment variable. + */ + + if (no_auto_connect()) { + bus_profile->input_ac = AutoConnectOption (0); + bus_profile->output_ac = AutoConnectOption (0); + } + + Config->set_input_auto_connect (bus_profile->input_ac); + Config->set_output_auto_connect (bus_profile->output_ac); + } save_state (""); @@ -678,6 +725,35 @@ Session::remove_state (string snapshot_name) sys::remove (xml_path); } +#ifdef HAVE_JACK_SESSION +void +Session::jack_session_event( jack_session_event_t * event ) +{ + if (save_state ("jacksession_snap")) { + event->flags = JackSessionSaveError; + } else { + sys::path xml_path (_session_dir->root_path()); + xml_path /= legalize_for_path ("jacksession_snap") + statefile_suffix; + + string cmd ("PROG_NAME -U "); + cmd += event->client_uuid; + cmd += ' \"'; + cmd += xml_path.to_string(); + cmd += '\"'; + + event->command_line = strdup (cmd.c_str()); + } + + jack_session_reply (_engine.jack(), event); + + if (event->type == JackSessionSaveAndQuit) { + // TODO: make ardour quit. + } + + jack_session_event_free( event ); +} +#endif + int Session::save_state (string snapshot_name, bool pending) { @@ -689,7 +765,8 @@ Session::save_state (string snapshot_name, bool pending) } if (!_engine.connected ()) { - error << _("Ardour's audio engine is not connected and state saving would lose all I/O connections. Session not saved") + error << string_compose (_("the %1 audio engine is not connected and state saving would lose all I/O connections. Session not saved"), + PROGRAM_NAME) << endmsg; return 1; } @@ -790,7 +867,7 @@ Session::load_state (string snapshot_name) /* there is pending state from a crashed capture attempt */ - if (AskAboutPendingState()) { + if (*AskAboutPendingState()) { state_was_pending = true; } } @@ -828,7 +905,7 @@ Session::load_state (string snapshot_name) XMLNode& root (*state_tree->root()); if (root.name() != X_("Session")) { - error << string_compose (_("Session file %1 is not an Ardour session"), xmlpath.to_string()) << endmsg; + error << string_compose (_("Session file %1 is not a session"), xmlpath.to_string()) << endmsg; delete state_tree; state_tree = 0; return -1; @@ -859,8 +936,8 @@ Session::load_state (string snapshot_name) return 0; } - info << string_compose (_("Copying old session file %1 to %2\nUse %2 with Ardour versions before 2.0 from now on"), - xmlpath.to_string(), backup_path.to_string()) + info << string_compose (_("Copying old session file %1 to %2\nUse %2 with %3 versions before 2.0 from now on"), + xmlpath.to_string(), backup_path.to_string(), PROGRAM_NAME) << endmsg; try @@ -993,15 +1070,14 @@ Session::state(bool full_state) if (full_state) { Glib::Mutex::Lock rl (region_lock); - - for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { - - /* only store regions not attached to playlists */ - - if (i->second->playlist() == 0) { - child->add_child_nocopy (i->second->state (true)); - } - } + const RegionFactory::RegionMap& region_map (RegionFactory::all_regions()); + for (RegionFactory::RegionMap::const_iterator i = region_map.begin(); i != region_map.end(); ++i) { + boost::shared_ptr r = i->second; + /* only store regions not attached to playlists */ + if (r->playlist() == 0) { + child->add_child_nocopy (r->state (true)); + } + } } child = node->add_child ("DiskStreams"); @@ -1049,6 +1125,12 @@ Session::state(bool full_state) RouteList public_order (*r); public_order.sort (cmp); + /* the sort should have put control outs first */ + + if (_monitor_out) { + assert (_monitor_out == public_order.front()); + } + for (RouteList::iterator i = public_order.begin(); i != public_order.end(); ++i) { if (!(*i)->is_hidden()) { if (full_state) { @@ -1060,39 +1142,13 @@ Session::state(bool full_state) } } + playlists->add_state (node, full_state); child = node->add_child ("RouteGroups"); for (list::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) { child->add_child_nocopy ((*i)->get_state()); } - child = node->add_child ("Playlists"); - for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) { - if (!(*i)->hidden()) { - if (!(*i)->empty()) { - if (full_state) { - child->add_child_nocopy ((*i)->get_state()); - } else { - child->add_child_nocopy ((*i)->get_template()); - } - } - } - } - - child = node->add_child ("UnusedPlaylists"); - for (PlaylistList::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) { - if (!(*i)->hidden()) { - if (!(*i)->empty()) { - if (full_state) { - child->add_child_nocopy ((*i)->get_state()); - } else { - child->add_child_nocopy ((*i)->get_template()); - } - } - } - } - - if (_click_io) { child = node->add_child ("Click"); child->add_child_nocopy (_click_io->state (full_state)); @@ -1153,7 +1209,7 @@ Session::set_state (const XMLNode& node, int version) _nominal_frame_rate = atoi (prop->value()); if (_nominal_frame_rate != _current_frame_rate) { - if (AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate)) { + if (*AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate)) { return -1; } } @@ -1270,13 +1326,13 @@ Session::set_state (const XMLNode& node, int version) if ((child = find_named_node (node, "Playlists")) == 0) { error << _("Session: XML state has no playlists section") << endmsg; goto out; - } else if (load_playlists (*child)) { + } else if (playlists->load (*this, *child)) { goto out; } if ((child = find_named_node (node, "UnusedPlaylists")) == 0) { // this is OK - } else if (load_unused_playlists (*child)) { + } else if (playlists->load_unused (*this, *child)) { goto out; } @@ -1305,6 +1361,20 @@ Session::set_state (const XMLNode& node, int version) } } + 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, "Routes")) == 0) { + error << _("Session: XML state has no routes section") << endmsg; + goto out; + } else if (load_routes (*child, version)) { + goto out; + } + if (version >= 3000) { if ((child = find_named_node (node, "RouteGroups")) == 0) { @@ -1331,20 +1401,6 @@ Session::set_state (const XMLNode& node, int version) } } - 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, "Routes")) == 0) { - error << _("Session: XML state has no routes section") << endmsg; - goto out; - } 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) { @@ -1398,35 +1454,90 @@ Session::load_routes (const XMLNode& node, int version) boost::shared_ptr Session::XMLRouteFactory (const XMLNode& node, int version) { + boost::shared_ptr ret; + if (node.name() != "Route") { - return boost::shared_ptr ((Route*) 0); + return ret; } - bool has_diskstream = (node.property ("diskstream") != 0 || node.property ("diskstream-id") != 0); + const XMLProperty* dsprop; + if ((dsprop = node.property (X_("diskstream-id"))) == 0) { + dsprop = node.property (X_("diskstream")); + } + DataType type = DataType::AUDIO; const XMLProperty* prop = node.property("default-type"); if (prop) { - type = DataType(prop->value()); + type = DataType (prop->value()); } - assert(type != DataType::NIL); + assert (type != DataType::NIL); - if (has_diskstream) { - if (type == DataType::AUDIO) { - AudioTrack* at = new AudioTrack (*this, node, version); - // boost_debug_shared_ptr_mark_interesting (at, typeid (at).name()); - boost::shared_ptr ret (at); - return ret; - } else { - boost::shared_ptr ret (new MidiTrack (*this, node, version)); - return ret; - } + if (dsprop) { + + boost::shared_ptr ds; + PBD::ID diskstream_id (dsprop->value()); + PBD::ID zero ("0"); + + /* this wierd hack is used when creating + tracks from a template. We have a special + ID for the diskstream that means "you + should create a new diskstream here, not + look for an old one." + */ + + if (diskstream_id != zero) { + + ds = diskstream_by_id (diskstream_id); + + if (!ds) { + error << string_compose (_("cannot find diskstream ID %1"), diskstream_id.to_s()) << endmsg; + return ret; + } + } + + Track* track; + + if (type == DataType::AUDIO) { + track = new AudioTrack (*this, X_("toBeResetFroXML")); + + } else { + track = new MidiTrack (*this, X_("toBeResetFroXML")); + } + + if (track->init()) { + delete track; + return ret; + } + + if (ds) { + track->set_diskstream (ds); + } else { + track->use_new_diskstream (); + } + + if (track->set_state (node, version)) { + delete track; + return ret; + } + + boost_debug_shared_ptr_mark_interesting (track, "Track"); + ret.reset (track); + } else { - boost::shared_ptr ret (new Route (*this, node)); - return ret; + Route* rt = new Route (*this, X_("toBeResetFroXML")); + + if (rt->init () == 0 && rt->set_state (node, version) == 0) { + boost_debug_shared_ptr_mark_interesting (rt, "Route"); + ret.reset (rt); + } else { + delete rt; + } } + + return ret; } int @@ -1754,7 +1865,7 @@ Session::XMLSourceFactory (const XMLNode& node) } catch (failed_constructor& err) { - error << _("Found a sound file that cannot be used by Ardour. Talk to the progammers.") << endmsg; + error << string_compose (_("Found a sound file that cannot be used by %1. Talk to the progammers."), PROGRAM_NAME) << endmsg; return boost::shared_ptr(); } } @@ -1958,65 +2069,6 @@ Session::get_best_session_directory_for_new_source () return result; } -int -Session::load_playlists (const XMLNode& node) -{ - XMLNodeList nlist; - XMLNodeConstIterator niter; - boost::shared_ptr playlist; - - nlist = node.children(); - - set_dirty(); - - for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - - if ((playlist = XMLPlaylistFactory (**niter)) == 0) { - error << _("Session: cannot create Playlist from XML description.") << endmsg; - } - } - - return 0; -} - -int -Session::load_unused_playlists (const XMLNode& node) -{ - XMLNodeList nlist; - XMLNodeConstIterator niter; - boost::shared_ptr playlist; - - nlist = node.children(); - - 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; - } - - // now manually untrack it - - track_playlist (false, boost::weak_ptr (playlist)); - } - - return 0; -} - -boost::shared_ptr -Session::XMLPlaylistFactory (const XMLNode& node) -{ - try { - return PlaylistFactory::create (*this, node); - } - - catch (failed_constructor& err) { - return boost::shared_ptr(); - } -} - int Session::load_named_selections (const XMLNode& node) { @@ -2186,15 +2238,14 @@ Session::remove_route_group (RouteGroup& rg) list::iterator i; if ((i = find (_route_groups.begin(), _route_groups.end(), &rg)) != _route_groups.end()) { - (*i)->apply (&Route::drop_route_group, this); _route_groups.erase (i); + delete &rg; + route_group_removed (); /* EMIT SIGNAL */ } - delete &rg; } - RouteGroup * Session::route_group_by_name (string name) { @@ -2208,6 +2259,23 @@ Session::route_group_by_name (string name) return 0; } +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::begin_reversible_command(const string& name) { @@ -2243,92 +2311,6 @@ Session::commit_reversible_command(Command *cmd) _current_trans.pop(); } -Session::GlobalRouteBooleanState -Session::get_global_route_boolean (bool (Route::*method)(void) const) -{ - GlobalRouteBooleanState s; - boost::shared_ptr r = routes.reader (); - - 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); - } - } - - return s; -} - -Session::GlobalRouteMeterState -Session::get_global_route_metering () -{ - GlobalRouteMeterState s; - boost::shared_ptr r = routes.reader (); - - 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); - } - } - - return s; -} - -void -Session::set_global_route_metering (GlobalRouteMeterState s, void* arg) -{ - for (GlobalRouteMeterState::iterator i = s.begin(); i != s.end(); ++i) { - - boost::shared_ptr r = (i->first.lock()); - - if (r) { - r->set_meter_point (i->second, arg); - } - } -} - -void -Session::set_global_route_boolean (GlobalRouteBooleanState s, void (Route::*method)(bool, void*), void* arg) -{ - for (GlobalRouteBooleanState::iterator i = s.begin(); i != s.end(); ++i) { - - boost::shared_ptr r = (i->first.lock()); - - if (r) { - Route* rp = r.get(); - (rp->*method) (i->second, arg); - } - } -} - -void -Session::set_global_mute (GlobalRouteBooleanState s, void* src) -{ - set_global_route_boolean (s, &Route::set_mute, src); -} - -void -Session::set_global_solo (GlobalRouteBooleanState s, void* src) -{ - set_global_route_boolean (s, &Route::set_solo, src); -} - -void -Session::set_global_record_enable (GlobalRouteBooleanState s, void* src) -{ - set_global_route_boolean (s, &Route::set_record_enable, src); -} - static bool accept_all_non_peak_files (const string& path, void */*arg*/) { @@ -2443,13 +2425,18 @@ struct RegionCounter { RegionCounter() : count (0) {} }; +int +Session::ask_about_playlist_deletion (boost::shared_ptr p) +{ + return *AskAboutPlaylistDeletion (p); +} + int Session::cleanup_sources (CleanupReport& rep) { // FIXME: needs adaptation to midi vector > dead_sources; - vector > playlists_tbd; PathScanner scanner; string sound_path; vector::iterator i; @@ -2463,38 +2450,13 @@ Session::cleanup_sources (CleanupReport& rep) _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) { - int status; - - status = AskAboutPlaylistDeletion (*x); - - switch (status) { - case -1: - ret = 0; - goto out; - break; - - case 0: - playlists_tbd.push_back (*x); - break; - - default: - /* leave it alone */ - break; - } - } - - /* now delete any that were marked for deletion */ - - for (vector >::iterator x = playlists_tbd.begin(); x != playlists_tbd.end(); ++x) { - (*x)->drop_references (); + + if (playlists->maybe_delete_unused (boost::bind (Session::ask_about_playlist_deletion, _1))) { + ret = 0; + goto out; } - playlists_tbd.clear (); - /* step 2: find all un-used sources */ rep.paths.clear (); @@ -2511,9 +2473,9 @@ Session::cleanup_sources (CleanupReport& rep) capture files. */ - if (!source_use_count(i->second) && i->second->length(i->second->timeline_position()) > 0) { + if (!playlists->source_use_count(i->second) && i->second->length(i->second->timeline_position()) > 0) { dead_sources.push_back (i->second); - i->second->GoingAway(); + i->second->drop_references (); } i = tmp; @@ -2832,8 +2794,7 @@ Session::remove_controllable (Controllable* c) Glib::Mutex::Lock lm (controllables_lock); - Controllables::iterator x = controllables.find( - boost::shared_ptr(c, null_deleter())); + Controllables::iterator x = controllables.find (boost::shared_ptr(c, null_deleter())); if (x != controllables.end()) { controllables.erase (x); @@ -2854,6 +2815,121 @@ Session::controllable_by_id (const PBD::ID& id) return boost::shared_ptr(); } +boost::shared_ptr +Session::controllable_by_descriptor (const ControllableDescriptor& desc) +{ + boost::shared_ptr c; + boost::shared_ptr r; + + switch (desc.top_level_type()) { + case ControllableDescriptor::NamedRoute: + { + std::string str = desc.top_level_name(); + if (str == "master") { + r = _master_out; + } else if (str == "control" || str == "listen") { + r = _monitor_out; + } else { + r = route_by_name (desc.top_level_name()); + } + break; + } + + case ControllableDescriptor::RemoteControlID: + r = route_by_remote_id (desc.rid()); + break; + } + + if (!r) { + return c; + } + + switch (desc.subtype()) { + case ControllableDescriptor::Gain: + c = r->gain_control (); + break; + + case ControllableDescriptor::Solo: + c = r->solo_control(); + break; + + case ControllableDescriptor::Mute: + c = r->mute_control(); + break; + + case ControllableDescriptor::Recenable: + { + boost::shared_ptr t = boost::dynamic_pointer_cast(r); + + if (t) { + c = t->rec_enable_control (); + } + break; + } + + case ControllableDescriptor::Pan: + /* XXX pan control */ + break; + + case ControllableDescriptor::Balance: + /* XXX simple pan control */ + break; + + case ControllableDescriptor::PluginParameter: + { + uint32_t plugin = desc.target (0); + uint32_t parameter_index = desc.target (1); + + /* revert to zero based counting */ + + if (plugin > 0) { + --plugin; + } + + if (parameter_index > 0) { + --parameter_index; + } + + boost::shared_ptr p = r->nth_plugin (plugin); + + if (p) { + c = boost::dynamic_pointer_cast( + p->control(Evoral::Parameter(PluginAutomation, 0, parameter_index))); + } + break; + } + + case ControllableDescriptor::SendGain: + { + uint32_t send = desc.target (0); + + /* revert to zero-based counting */ + + if (send > 0) { + --send; + } + + boost::shared_ptr p = r->nth_send (send); + + if (p) { + boost::shared_ptr s = boost::dynamic_pointer_cast(p); + boost::shared_ptr a = s->amp(); + + if (a) { + c = s->amp()->gain_control(); + } + } + break; + } + + default: + /* relax and return a null pointer */ + break; + } + + return c; +} + void Session::add_instant_xml (XMLNode& node, bool write_to_config) { @@ -2985,12 +3061,6 @@ Session::restore_history (string snapshot_name) 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 = @@ -3011,6 +3081,10 @@ Session::restore_history (string snapshot_name) error << _("Failed to downcast MidiSource for DeltaCommand") << endmsg; } + } else if (n->name() == "StatefulDiffCommand") { + if ((c = stateful_diff_command_factory (n))) { + ut->add_command (c); + } } else { error << string_compose(_("Couldn't figure out how to make a Command out of a %1 XMLNode."), n->name()) << endmsg; } @@ -3056,9 +3130,9 @@ Session::config_changed (std::string p, bool ours) if ((location = _locations.auto_punch_location()) != 0) { if (config.get_punch_in ()) { - replace_event (Event::PunchIn, location->start()); + replace_event (SessionEvent::PunchIn, location->start()); } else { - remove_event (location->start(), Event::PunchIn); + remove_event (location->start(), SessionEvent::PunchIn); } } @@ -3069,17 +3143,17 @@ Session::config_changed (std::string p, bool ours) if ((location = _locations.auto_punch_location()) != 0) { if (config.get_punch_out()) { - replace_event (Event::PunchOut, location->end()); + replace_event (SessionEvent::PunchOut, location->end()); } else { - clear_events (Event::PunchOut); + clear_events (SessionEvent::PunchOut); } } } else if (p == "edit-mode") { - Glib::Mutex::Lock lm (playlist_lock); + Glib::Mutex::Lock lm (playlists->lock); - for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) { + for (SessionPlaylists::List::iterator i = playlists->playlists.begin(); i != playlists->playlists.end(); ++i) { (*i)->set_edit_mode (Config->get_edit_mode ()); } @@ -3212,7 +3286,7 @@ Session::config_changed (std::string p, bool ours) if (!config.get_external_sync()) { drop_sync_source (); } else { - use_sync_source (config.get_sync_source()); + switch_to_sync_source (config.get_sync_source()); } } else if (p == "remote-model") { set_remote_control_ids ();