X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession.cc;h=f9a616936367e83f00976d22f9162c11dc48d517;hb=0d9030cee18b332206650df68428637dd159c3b2;hp=e4fc664b7eec5bb9490622ee5868e0f9638ac948;hpb=2c9c2102138f20e32545f8bda7d1dc72587663e8;p=ardour.git diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index e4fc664b7e..f9a6169363 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -37,7 +37,6 @@ #include "pbd/basename.h" #include "pbd/convert.h" -#include "pbd/convert.h" #include "pbd/error.h" #include "pbd/file_utils.h" #include "pbd/md5.h" @@ -90,6 +89,7 @@ #include "ardour/recent_sessions.h" #include "ardour/region.h" #include "ardour/region_factory.h" +#include "ardour/revision.h" #include "ardour/route_graph.h" #include "ardour/route_group.h" #include "ardour/send.h" @@ -113,7 +113,7 @@ #include "LuaBridge/LuaBridge.h" -#include "i18n.h" +#include "pbd/i18n.h" #include @@ -177,6 +177,7 @@ Session::Session (AudioEngine &eng, , _record_status (Disabled) , _transport_frame (0) , _session_range_location (0) + , _session_range_end_is_free (true) , _slave (0) , _silent (false) , _transport_speed (0) @@ -211,7 +212,10 @@ Session::Session (AudioEngine &eng, , post_export_position (0) , _exporting (false) , _export_rolling (false) + , _realtime_export (false) + , _region_export (false) , _export_preroll (0) + , _export_latency (0) , _pre_export_mmc_enabled (false) , _name (snapshot_name) , _is_new (true) @@ -236,7 +240,7 @@ Session::Session (AudioEngine &eng, , pending_locate_flush (false) , pending_abort (false) , pending_auto_loop (false) - , _mempool ("Session", 1048576) + , _mempool ("Session", 2097152) , lua (lua_newstate (&PBD::ReallocPool::lalloc, &_mempool)) , _n_lua_scripts (0) , _butler (new Butler (*this)) @@ -248,6 +252,7 @@ Session::Session (AudioEngine &eng, , _rt_thread_active (false) , _rt_emit_pending (false) , _ac_thread_active (false) + , _latency_recompute_pending (0) , step_speed (0) , outbound_mtc_timecode_frame (0) , next_quarter_frame_to_send (-1) @@ -316,6 +321,8 @@ Session::Session (AudioEngine &eng, { uint32_t sr = 0; + created_with = string_compose ("%1 %2", PROGRAM_NAME, revision); + pthread_mutex_init (&_rt_emit_mutex, 0); pthread_cond_init (&_rt_emit_cond, 0); @@ -904,6 +911,14 @@ Session::setup_click_state (const XMLNode* node) } } +void +Session::get_physical_ports (vector& inputs, vector& outputs, DataType type, + MidiPortFlags include, MidiPortFlags exclude) +{ + _engine.get_physical_inputs (type, inputs, include, exclude); + _engine.get_physical_outputs (type, outputs, include, exclude); +} + void Session::setup_bundles () { @@ -922,9 +937,12 @@ Session::setup_bundles () vector inputs[DataType::num_types]; vector outputs[DataType::num_types]; + for (uint32_t i = 0; i < DataType::num_types; ++i) { - _engine.get_physical_inputs (DataType (DataType::Symbol (i)), inputs[i]); - _engine.get_physical_outputs (DataType (DataType::Symbol (i)), outputs[i]); + get_physical_ports (inputs[i], outputs[i], DataType (DataType::Symbol (i)), + MidiPortFlags (0), /* no specific inclusions */ + MidiPortFlags (MidiPortControl|MidiPortVirtual) /* exclude control & virtual ports */ + ); } /* Create a set of Bundle objects that map @@ -1008,6 +1026,7 @@ Session::setup_bundles () for (uint32_t np = 0; np < inputs[DataType::MIDI].size(); ++np) { string n = inputs[DataType::MIDI][np]; + std::string pn = _engine.get_pretty_name_by_name (n); if (!pn.empty()) { n = pn; @@ -1311,8 +1330,12 @@ Session::reset_monitor_section () _master_out->output()->disconnect (this); _monitor_out->output()->disconnect (this); - _monitor_out->input()->ensure_io (_master_out->output()->n_ports(), false, this); - _monitor_out->output()->ensure_io (_master_out->output()->n_ports(), false, this); + // monitor section follow master bus - except midi + ChanCount mon_chn (_master_out->output()->n_ports()); + mon_chn.set_midi (0); + + _monitor_out->input()->ensure_io (mon_chn, false, this); + _monitor_out->output()->ensure_io (mon_chn, false, this); for (uint32_t n = 0; n < limit; ++n) { boost::shared_ptr p = _monitor_out->input()->ports().nth_audio_port (n); @@ -1942,7 +1965,7 @@ void Session::set_all_tracks_record_enabled (bool enable ) { boost::shared_ptr rl = routes.reader(); - set_controls (route_list_to_control_list (rl, &Track::rec_enable_control), enable, Controllable::NoGroup); + set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), enable, Controllable::NoGroup); } void @@ -2019,59 +2042,55 @@ framepos_t Session::audible_frame () const { framepos_t ret; - framepos_t tf; - framecnt_t offset; - offset = worst_playback_latency (); + frameoffset_t offset = worst_playback_latency (); // - _engine.samples_since_cycle_start (); + offset *= transport_speed (); if (synced_to_engine()) { /* Note: this is basically just sync-to-JACK */ - tf = _engine.transport_frame(); + ret = _engine.transport_frame(); } else { - tf = _transport_frame; + ret = _transport_frame; } - ret = tf; - - if (!non_realtime_work_pending()) { - - /* MOVING */ + if (transport_rolling()) { + ret -= offset; /* Check to see if we have passed the first guaranteed - audible frame past our last start position. if not, - return that last start point because in terms - of audible frames, we have not moved yet. - - `Start position' in this context means the time we last - either started, located, or changed transport direction. - */ + * audible frame past our last start position. if not, + * return that last start point because in terms + * of audible frames, we have not moved yet. + * + * `Start position' in this context means the time we last + * either started, located, or changed transport direction. + */ if (_transport_speed > 0.0f) { if (!play_loop || !have_looped) { - if (tf < _last_roll_or_reversal_location + offset) { + if (ret < _last_roll_or_reversal_location) { return _last_roll_or_reversal_location; } + } else { + // latent loops + Location *location = _locations->auto_loop_location(); + frameoffset_t lo = location->start() - ret; + if (lo > 0) { + ret = location->end () - lo; + } } - - /* forwards */ - ret -= offset; - } else if (_transport_speed < 0.0f) { /* XXX wot? no backward looping? */ - if (tf > _last_roll_or_reversal_location - offset) { + if (ret > _last_roll_or_reversal_location) { return _last_roll_or_reversal_location; - } else { - /* backwards */ - ret += offset; } } } - return ret; + return std::max ((framepos_t)0, ret); } void @@ -2305,7 +2324,7 @@ Session::resort_routes_using (boost::shared_ptr r) #ifndef NDEBUG DEBUG_TRACE (DEBUG::Graph, "Routes resorted, order follows:\n"); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - DEBUG_TRACE (DEBUG::Graph, string_compose ("\t%1 presentation order %2\n", (*i)->name(), (*i)->presentation_info().global_order())); + DEBUG_TRACE (DEBUG::Graph, string_compose ("\t%1 presentation order %2\n", (*i)->name(), (*i)->presentation_info().order())); } #endif @@ -2361,8 +2380,11 @@ Session::find_route_name (string const & base, uint32_t& id, string& name, bool } } - if (!definitely_add_number && route_by_name (base) == 0) { - /* juse use the base */ + /* if we have "base 1" already, it doesn't make sense to add "base" + * if "base 1" has been deleted, adding "base" is no worse than "base 1" + */ + if (!definitely_add_number && route_by_name (base) == 0 && (route_by_name (string_compose("%1 1", base)) == 0)) { + /* just use the base */ name = base; return true; } @@ -2425,7 +2447,7 @@ Session::default_track_name_pattern (DataType t) list > Session::new_midi_track (const ChanCount& input, const ChanCount& output, boost::shared_ptr instrument, Plugin::PresetRecord* pset, - RouteGroup* route_group, uint32_t how_many, string name_template, PresentationInfo::order_t order, + RouteGroup* route_group, uint32_t how_many, string name_template, PresentationInfo::order_t order, TrackMode mode) { string track_name; @@ -2511,12 +2533,15 @@ Session::new_midi_track (const ChanCount& input, const ChanCount& output, if (instrument) { for (RouteList::iterator r = new_routes.begin(); r != new_routes.end(); ++r) { PluginPtr plugin = instrument->load (*this); + if (!plugin) { + warning << "Failed to add Synth Plugin to newly created track." << endmsg; + continue; + } if (pset) { plugin->load_preset (*pset); } boost::shared_ptr p (new PluginInsert (*this, plugin)); (*r)->add_processor (p, PreFader); - } } } @@ -2540,7 +2565,7 @@ Session::new_midi_route (RouteGroup* route_group, uint32_t how_many, string name error << "cannot find name for new midi bus" << endmsg; goto failure; } - + try { boost::shared_ptr bus (new Route (*this, bus_name, flag, DataType::AUDIO)); // XXX Editor::add_routes is not ready for ARDOUR::DataType::MIDI @@ -2573,6 +2598,7 @@ Session::new_midi_route (RouteGroup* route_group, uint32_t how_many, string name route_group->add (bus); } + bus->add_internal_return (); ret.push_back (bus); } @@ -2598,6 +2624,10 @@ Session::new_midi_route (RouteGroup* route_group, uint32_t how_many, string name if (instrument) { for (RouteList::iterator r = ret.begin(); r != ret.end(); ++r) { PluginPtr plugin = instrument->load (*this); + if (!plugin) { + warning << "Failed to add Synth Plugin to newly created track." << endmsg; + continue; + } if (pset) { plugin->load_preset (*pset); } @@ -2921,24 +2951,28 @@ Session::reconnect_mmc_ports(bool inputs) #endif void -Session::ensure_presentation_info_gap (PresentationInfo::order_t first_new_order, uint32_t how_many) +Session::ensure_route_presentation_info_gap (PresentationInfo::order_t first_new_order, uint32_t how_many) { if (first_new_order == PresentationInfo::max_order) { /* adding at end, no worries */ return; } - /* create a gap in the existing route order keys to accomodate new routes.*/ - boost::shared_ptr rd = routes.reader(); - for (RouteList::iterator ri = rd->begin(); ri != rd->end(); ++ri) { - boost::shared_ptr rt (*ri); + /* create a gap in the presentation info to accomodate @param how_many + * new objects. + */ + StripableList sl; + get_stripables (sl); + + for (StripableList::iterator si = sl.begin(); si != sl.end(); ++si) { + boost::shared_ptr s (*si); - if (rt->presentation_info().special()) { + if (s->is_monitor() || s->is_auditioner()) { continue; } - if (rt->presentation_info().group_order () >= first_new_order) { - rt->set_presentation_group_order (rt->presentation_info().group_order () + how_many); + if (s->presentation_info().order () >= first_new_order) { + s->set_presentation_order (s->presentation_info().order () + how_many); } } } @@ -3071,8 +3105,6 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Bus"); - ensure_presentation_info_gap (order, how_many); - while (how_many) { if (!find_route_name (name_template.empty () ? _("Bus") : name_template, ++bus_id, bus_name, use_number)) { error << "cannot find name for new audio bus" << endmsg; @@ -3148,7 +3180,8 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r } RouteList -Session::new_route_from_template (uint32_t how_many, const std::string& template_path, const std::string& name_base, PlaylistDisposition pd) +Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t insert_at, const std::string& template_path, const std::string& name_base, + PlaylistDisposition pd) { XMLTree tree; @@ -3156,11 +3189,11 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template return RouteList(); } - return new_route_from_template (how_many, *tree.root(), name_base, pd); + return new_route_from_template (how_many, insert_at, *tree.root(), name_base, pd); } RouteList -Session::new_route_from_template (uint32_t how_many, XMLNode& node, const std::string& name_base, PlaylistDisposition pd) +Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t insert_at, XMLNode& node, const std::string& name_base, PlaylistDisposition pd) { RouteList ret; uint32_t number = 0; @@ -3257,6 +3290,10 @@ Session::new_route_from_template (uint32_t how_many, XMLNode& node, const std::s (*i)->add_property ("bitslot", buf); (*i)->add_property ("name", name); } + else if (type && type->value() == X_("intreturn")) { + (*i)->remove_property (X_("bitslot")); + (*i)->add_property ("ignore-bitslot", "1"); + } else if (type && type->value() == X_("return")) { // Return::set_state() generates a new one (*i)->remove_property (X_("bitslot")); @@ -3326,9 +3363,9 @@ Session::new_route_from_template (uint32_t how_many, XMLNode& node, const std::s if (!ret.empty()) { StateProtector sp (this); if (Profile->get_trx()) { - add_routes (ret, false, false, false, PresentationInfo::max_order); + add_routes (ret, false, false, false, insert_at); } else { - add_routes (ret, true, true, false, PresentationInfo::max_order); + add_routes (ret, true, true, false, insert_at); } IO::enable_connecting (); } @@ -3391,7 +3428,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool } DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("ensure order gap starting at %1 for %2\n", order, new_routes.size())); - ensure_presentation_info_gap (order, new_routes.size()); + ensure_route_presentation_info_gap (order, new_routes.size()); for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x, ++added) { @@ -3404,6 +3441,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool r->output()->changed.connect_same_thread (*this, boost::bind (&Session::set_worst_io_latencies_x, this, _1, _2)); r->processors_changed.connect_same_thread (*this, boost::bind (&Session::route_processors_changed, this, _1)); + r->processor_latency_changed.connect_same_thread (*this, boost::bind (&Session::queue_latency_recompute, this)); if (r->is_master()) { _master_out = r; @@ -3423,6 +3461,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool if (mt) { mt->StepEditStatusChange.connect_same_thread (*this, boost::bind (&Session::step_edit_status_change, this, _1)); mt->output()->changed.connect_same_thread (*this, boost::bind (&Session::midi_output_change_handler, this, _1, _2, boost::weak_ptr(mt))); + mt->presentation_info().PropertyChanged.connect_same_thread (*this, boost::bind (&Session::midi_track_presentation_info_changed, this, _1, boost::weak_ptr(mt))); } } @@ -3432,27 +3471,31 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool /* presentation info order may already have been set from XML */ - if (r->presentation_info().unordered()) { + if (!r->presentation_info().order_set()) { if (order == PresentationInfo::max_order) { /* just add to the end */ - r->set_presentation_group_order_explicit (n_routes + added); + r->set_presentation_order (n_routes + added, false); DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("group order not set, set to NR %1 + %2 = %3\n", n_routes, added, n_routes + added)); } else { - r->set_presentation_group_order_explicit (order + added); + r->set_presentation_order (order + added); DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("group order not set, set to %1 + %2 = %3\n", order, added, order + added)); } } else { - DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("group order already set to %1\n", r->presentation_info().group_order())); + DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("group order already set to %1\n", r->presentation_info().order())); } } - DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("added route %1, group order %2 global order %3 type %4 (summary: %5)\n", +#if !defined(__APPLE__) && !defined(__FreeBSD__) + /* clang complains: 'operator<<' should be declared prior to the call site or in an associated namespace of one of its + * arguments std::ostream& operator<<(std::ostream& o, ARDOUR::PresentationInfo const& rid)" + */ + DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("added route %1, group order %2 type %3 (summary: %4)\n", r->name(), - r->presentation_info().group_order(), - r->presentation_info().global_order(), + r->presentation_info().order(), enum_2_string (r->presentation_info().flags()), - r->presentation_info().to_string())); + r->presentation_info())); +#endif if (input_auto_connect || output_auto_connect) { @@ -3477,6 +3520,8 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool } } } + + reassign_track_numbers (); } void @@ -3663,6 +3708,7 @@ Session::remove_routes (boost::shared_ptr routes_to_remove) */ for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) { + cerr << "Drop references to " << (*iter)->name() << endl; (*iter)->drop_references (); } @@ -3670,7 +3716,7 @@ Session::remove_routes (boost::shared_ptr routes_to_remove) return; } - Stripable::PresentationInfoChange(); /* EMIT SIGNAL */ + PresentationInfo::Change(); /* EMIT SIGNAL */ /* save the new state of the world */ @@ -3744,8 +3790,6 @@ Session::route_listen_changed (Controllable::GroupControlDisposition group_overr _listen_cnt--; } - - update_route_solo_state (); } void @@ -3779,7 +3823,7 @@ Session::route_solo_isolated_changed (boost::weak_ptr wpr) void Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlDisposition group_override, boost::weak_ptr wpr) { - DEBUG_TRACE (DEBUG::Solo, string_compose ("route solo change, self = %1\n", self_solo_changed)); + DEBUG_TRACE (DEBUG::Solo, string_compose ("route solo change, self = %1, update\n", self_solo_changed)); boost::shared_ptr route (wpr.lock()); @@ -3795,21 +3839,13 @@ Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlD DEBUG_TRACE (DEBUG::Solo, string_compose ("%1: self %2 masters %3 transition %4\n", route->name(), route->self_soloed(), route->solo_control()->get_masters_value(), route->solo_control()->transitioned_into_solo())); if (route->solo_control()->transitioned_into_solo() == 0) { - /* route solo changed by upstream/downstream; not interesting + /* route solo changed by upstream/downstream or clear all solo state; not interesting to Session. */ DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 not self-soloed nor soloed by master (%2), ignoring\n", route->name(), route->solo_control()->get_masters_value())); return; } - if (route->solo_control()->transitioned_into_solo() == 0) { - /* reason for being soloed changed (e.g. master went away, we - * took over the master state), but actual status did - * not. nothing to do. - */ - DEBUG_TRACE (DEBUG::Solo, string_compose ("%1: solo change was change in reason, not status\n", route->name())); - } - boost::shared_ptr r = routes.reader (); int32_t delta = route->solo_control()->transitioned_into_solo (); @@ -3832,6 +3868,8 @@ Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlD RouteGroup* rg = route->route_group (); const bool group_already_accounted_for = (group_override == Controllable::ForGroup); + DEBUG_TRACE (DEBUG::Solo, string_compose ("propagate to session, group accounted for ? %1\n", group_already_accounted_for)); + if (delta == 1 && Config->get_exclusive_solo()) { /* new solo: disable all other solos, but not the group if its solo-enabled */ @@ -3878,6 +3916,8 @@ Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlD if ((*i)->solo_isolate_control()->solo_isolated() || !(*i)->can_solo()) { /* route does not get solo propagated to it */ + DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 excluded from solo because iso = %2 can_solo = %3\n", (*i)->name(), (*i)->solo_isolate_control()->solo_isolated(), + (*i)->can_solo())); continue; } @@ -3943,8 +3983,6 @@ Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlD DEBUG_TRACE (DEBUG::Solo, "propagation complete\n"); - update_route_solo_state (r); - /* now notify that the mute state of the routes not involved in the signal pathway of the just-solo-changed route may have altered. */ @@ -3952,11 +3990,10 @@ Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlD for (RouteList::iterator i = uninvolved.begin(); i != uninvolved.end(); ++i) { DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1, which neither feeds or is fed by %2\n", (*i)->name(), route->name())); (*i)->act_on_mute (); - (*i)->mute_control()->Changed (false, Controllable::NoGroup); + /* Session will emit SoloChanged() after all solo changes are + * complete, which should be used by UIs to update mute status + */ } - - SoloChanged (); /* EMIT SIGNAL */ - set_dirty(); } void @@ -3976,13 +4013,13 @@ Session::update_route_solo_state (boost::shared_ptr r) for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if ((*i)->can_solo()) { if (Config->get_solo_control_is_listen_control()) { - if ((*i)->self_soloed() || (*i)->solo_control()->get_masters_value()) { + if ((*i)->solo_control()->soloed_by_self_or_masters()) { listeners++; something_listening = true; } } else { (*i)->set_listen (false); - if ((*i)->can_solo() && ((*i)->self_soloed() || (*i)->solo_control()->get_masters_value())) { + if ((*i)->can_solo() && (*i)->solo_control()->soloed_by_self_or_masters()) { something_soloed = true; } } @@ -4012,6 +4049,10 @@ Session::update_route_solo_state (boost::shared_ptr r) DEBUG_TRACE (DEBUG::Solo, string_compose ("solo state updated by session, soloed? %1 listeners %2 isolated %3\n", something_soloed, listeners, isolated)); + + + SoloChanged (); /* EMIT SIGNAL */ + set_dirty(); } void @@ -4206,30 +4247,48 @@ Session::track_by_diskstream_id (PBD::ID id) const } boost::shared_ptr -Session::get_remote_nth_route (uint16_t n) const +Session::get_remote_nth_route (PresentationInfo::order_t n) const { return boost::dynamic_pointer_cast (get_remote_nth_stripable (n, PresentationInfo::Route)); } boost::shared_ptr -Session::get_remote_nth_stripable (uint16_t n, PresentationInfo::Flag flags) const +Session::get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo::Flag flags) const { - boost::shared_ptr r = routes.reader (); - vector > v; + StripableList sl; + PresentationInfo::order_t match_cnt = 0; - if (n >= r->size()) { - return boost::shared_ptr (); - } + get_stripables (sl); + sl.sort (Stripable::PresentationOrderSorter()); - v.assign (r->size(), boost::shared_ptr()); + for (StripableList::const_iterator s = sl.begin(); s != sl.end(); ++s) { - for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - if ((*i)->presentation_info().flag_match (flags)) { - v[(*i)->presentation_info().group_order()] = (*i); + if ((*s)->presentation_info().hidden()) { + /* if the caller didn't explicitly ask for hidden + stripables, ignore hidden ones. This matches + the semantics of the pre-PresentationOrder + "get by RID" logic of Ardour 4.x and earlier. + + XXX at some point we should likely reverse + the logic of the flags, because asking for "the + hidden stripables" is not going to be common, + whereas asking for visible ones is normal. + */ + + if (! (flags & PresentationInfo::Hidden)) { + continue; + } + } + + if ((*s)->presentation_info().flag_match (flags)) { + if (match_cnt++ == n) { + return *s; + } } } - return v[n]; + /* there is no nth stripable that matches the given flags */ + return boost::shared_ptr(); } boost::shared_ptr @@ -4249,11 +4308,11 @@ struct PresentationOrderSorter { if (a->presentation_info().special() && !b->presentation_info().special()) { /* a is not ordered, b is; b comes before a */ return false; - } else if (b->presentation_info().unordered() && !a->presentation_info().unordered()) { + } else if (!b->presentation_info().order_set() && a->presentation_info().order_set()) { /* b is not ordered, a is; a comes before b */ return true; } else { - return a->presentation_info().global_order() < b->presentation_info().global_order(); + return a->presentation_info().order() < b->presentation_info().order(); } } }; @@ -4291,6 +4350,16 @@ Session::reassign_track_numbers () // trigger GUI re-layout config.ParameterChanged("track-name-number"); } + +#ifndef NDEBUG + if (DEBUG_ENABLED(DEBUG::OrderKeys)) { + boost::shared_ptr rl = routes.reader (); + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("%1 numbered %2\n", (*i)->name(), (*i)->track_number())); + } + } +#endif /* NDEBUG */ + } void @@ -4356,12 +4425,18 @@ Session::maybe_update_session_range (framepos_t a, framepos_t b) _session_range_location->set_start (a); } - if (b > _session_range_location->end()) { + if (_session_range_end_is_free && (b > _session_range_location->end())) { _session_range_location->set_end (b); } } } +void +Session::set_end_is_free (bool yn) +{ + _session_range_end_is_free = yn; +} + void Session::playlist_ranges_moved (list > const & ranges) { @@ -5140,6 +5215,7 @@ Session::try_run_lua (pframes_t nframes) Glib::Threads::Mutex::Lock tm (lua_lock, Glib::Threads::TRY_LOCK); if (tm.locked ()) { try { (*_lua_run)(nframes); } catch (luabridge::LuaException const& e) { } + lua.collect_garbage_step (); } } @@ -5149,6 +5225,7 @@ Session::setup_lua () #ifndef NDEBUG lua.Print.connect (&_lua_print); #endif + lua.tweak_rt_gc (); lua.do_command ( "function ArdourSession ()" " local self = { scripts = {}, instances = {} }" @@ -5340,7 +5417,7 @@ Session::RoutePublicOrderSorter::operator() (boost::shared_ptr a, boost:: if (b->is_monitor()) { return false; } - return a->presentation_info() < b->presentation_info(); + return a->presentation_info().order() < b->presentation_info().order(); } bool @@ -6139,25 +6216,32 @@ Session::update_route_record_state () void Session::listen_position_changed () { - boost::shared_ptr r = routes.reader (); - - for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - (*i)->listen_position_changed (); + { + boost::shared_ptr r = routes.reader (); + PBD::Unwinder uw (ignore_route_processor_changes, true); + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + (*i)->listen_position_changed (); + } } + route_processors_changed (RouteProcessorChange ()); } void Session::solo_control_mode_changed () { if (soloing() || listening()) { - /* We can't use ::clear_all_solo_state() here because during - session loading at program startup, that will queue a call - to rt_clear_all_solo_state() that will not execute until - AFTER solo states have been established (thus throwing away - the session's saved solo state). So just explicitly turn - them all off. - */ - set_controls (route_list_to_control_list (get_routes(), &Route::solo_control), 0.0, Controllable::NoGroup); + if (loading()) { + /* We can't use ::clear_all_solo_state() here because during + session loading at program startup, that will queue a call + to rt_clear_all_solo_state() that will not execute until + AFTER solo states have been established (thus throwing away + the session's saved solo state). So just explicitly turn + them all off. + */ + set_controls (route_list_to_control_list (get_routes(), &Stripable::solo_control), 0.0, Controllable::NoGroup); + } else { + clear_all_solo_state (get_routes()); + } } } @@ -6181,6 +6265,10 @@ Session::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr { update_route_record_state (); RouteRemovedFromRouteGroup (rg, r); /* EMIT SIGNAL */ + + if (!rg->has_control_master () && !rg->has_subgroup () && rg->empty()) { + remove_route_group (*rg); + } } boost::shared_ptr @@ -6235,12 +6323,12 @@ Session::goto_end () } void -Session::goto_start () +Session::goto_start (bool and_roll) { if (_session_range_location) { - request_locate (_session_range_location->start(), false); + request_locate (_session_range_location->start(), and_roll); } else { - request_locate (0, false); + request_locate (0, and_roll); } } @@ -6306,6 +6394,7 @@ Session::start_time_changed (framepos_t old) if (l && l->start() == old) { l->set_start (s->start(), true); } + set_dirty (); } void @@ -6325,6 +6414,7 @@ Session::end_time_changed (framepos_t old) if (l && l->end() == old) { l->set_end (s->end(), true); } + set_dirty (); } std::vector @@ -6687,7 +6777,7 @@ Session::notify_presentation_info_change () return; } - Stripable::PresentationInfoChange (); /* EMIT SIGNAL */ + PresentationInfo::Change (); /* EMIT SIGNAL */ reassign_track_numbers(); #ifdef USE_TRACKS_CODE_FEATURES @@ -6800,12 +6890,25 @@ Session::auto_connect_route (boost::shared_ptr route, bool connect_inputs input_start, output_start, input_offset, output_offset)); + auto_connect_thread_wakeup (); +} + +void +Session::auto_connect_thread_wakeup () +{ if (pthread_mutex_trylock (&_auto_connect_mutex) == 0) { pthread_cond_signal (&_auto_connect_cond); pthread_mutex_unlock (&_auto_connect_mutex); } } +void +Session::queue_latency_recompute () +{ + g_atomic_int_inc (&_latency_recompute_pending); + auto_connect_thread_wakeup (); +} + void Session::auto_connect (const AutoConnectRequest& ar) { @@ -6842,8 +6945,12 @@ Session::auto_connect (const AutoConnectRequest& ar) vector physinputs; vector physoutputs; - _engine.get_physical_outputs (*t, physoutputs); - _engine.get_physical_inputs (*t, physinputs); + + /* for connecting track inputs we only want MIDI ports marked + * for "music". + */ + + get_physical_ports (physinputs, physoutputs, *t, MidiPortMusic); if (!physinputs.empty() && ar.connect_inputs) { uint32_t nphysical_in = physinputs.size(); @@ -6926,10 +7033,7 @@ Session::auto_connect_thread_terminate () } } - if (pthread_mutex_lock (&_auto_connect_mutex) == 0) { - pthread_cond_signal (&_auto_connect_cond); - pthread_mutex_unlock (&_auto_connect_mutex); - } + auto_connect_thread_wakeup (); void *status; pthread_join (_auto_connect_thread, &status); @@ -6971,7 +7075,34 @@ Session::auto_connect_thread_run () } } + if (!actively_recording ()) { // might not be needed, + /* this is only used for updating plugin latencies, the + * graph does not change. so it's safe in general. + * BUT.. + * .. update_latency_compensation () entails set_capture_offset() + * which calls Diskstream::set_capture_offset () which + * modifies the capture offset... which can be a proplem + * in "prepare_to_stop" + */ + while (g_atomic_int_and (&_latency_recompute_pending, 0)) { + update_latency_compensation (); + } + } + + AudioEngine::instance()->clear_pending_port_deletions (); + pthread_cond_wait (&_auto_connect_cond, &_auto_connect_mutex); } pthread_mutex_unlock (&_auto_connect_mutex); } + +void +Session::cancel_all_solo () +{ + StripableList sl; + + get_stripables (sl); + + set_controls (stripable_list_to_control_list (sl, &Stripable::solo_control), 0.0, Controllable::NoGroup); + clear_all_solo_state (routes.reader()); +}