X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession.cc;h=e569188a387333531ecc42cabe8138945412f861;hb=6be56d78b199452e5dba726f2d7aaab2777d2b49;hp=c22cfd261a0223f8349fa1ced44e75907fa63f72;hpb=6f306c98216a2901d45d1b5537d836d084673eb3;p=ardour.git diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index c22cfd261a..e569188a38 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -99,7 +99,8 @@ #include "ardour/tempo.h" #include "ardour/utils.h" #include "ardour/graph.h" -#include "ardour/vbap_speakers.h" +#include "ardour/speakers.h" +#include "ardour/operations.h" #include "midi++/port.h" #include "midi++/mmc.h" @@ -151,6 +152,7 @@ Session::Session (AudioEngine &eng, , _total_free_4k_blocks (0) , _bundles (new BundleList) , _bundle_xml_node (0) + , _current_trans (0) , _click_io ((IO*) 0) , click_data (0) , click_emphasis_data (0) @@ -764,11 +766,9 @@ Session::track_playlist_changed (boost::weak_ptr wp) boost::shared_ptr playlist; if ((playlist = track->playlist()) != 0) { - playlist->LengthChanged.connect_same_thread (*this, boost::bind (&Session::update_session_range_location_marker, this)); - playlist->RangesMoved.connect_same_thread (*this, boost::bind (&Session::update_session_range_location_marker, this)); + playlist->RegionAdded.connect_same_thread (*this, boost::bind (&Session::playlist_region_added, this, _1)); + playlist->RangesMoved.connect_same_thread (*this, boost::bind (&Session::playlist_ranges_moved, this, _1)); } - - update_session_range_location_marker (); } bool @@ -1792,7 +1792,7 @@ Session::set_remote_control_ids () /** Caller must not hold process lock */ RouteList -Session::new_audio_route (bool aux, int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many) +Session::new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many) { char bus_name[32]; uint32_t bus_id = 0; @@ -1850,9 +1850,7 @@ Session::new_audio_route (bool aux, int input_channels, int output_channels, Rou bus->set_remote_control_id (control_id); ++control_id; - if (aux) { - bus->add_internal_return (); - } + bus->add_internal_return (); ret.push_back (bus); } @@ -2168,7 +2166,6 @@ Session::remove_route (boost::shared_ptr route) } update_route_solo_state (); - update_session_range_location_marker (); // We need to disconnect the route's inputs and outputs @@ -2496,64 +2493,77 @@ Session::route_by_remote_id (uint32_t id) return boost::shared_ptr ((Route*) 0); } -/** If either end of the session range location marker lies inside the current - * session extent, move it to the corresponding session extent. +void +Session::playlist_region_added (boost::weak_ptr w) +{ + boost::shared_ptr r = w.lock (); + if (!r) { + return; + } + + /* These are the operations that are currently in progress... */ + list curr = _current_trans_quarks; + curr.sort (); + + /* ...and these are the operations during which we want to update + the session range location markers. + */ + list ops; + ops.push_back (Operations::capture); + ops.push_back (Operations::paste); + ops.push_back (Operations::duplicate_region); + ops.push_back (Operations::insert_file); + ops.push_back (Operations::insert_region); + ops.push_back (Operations::drag_region_brush); + ops.push_back (Operations::region_drag); + ops.push_back (Operations::selection_grab); + ops.push_back (Operations::region_fill); + ops.push_back (Operations::fill_selection); + ops.push_back (Operations::create_region); + ops.sort (); + + /* See if any of the current operations match the ones that we want */ + list in; + set_intersection (_current_trans_quarks.begin(), _current_trans_quarks.end(), ops.begin(), ops.end(), back_inserter (in)); + + /* If so, update the session range markers */ + if (!in.empty ()) { + maybe_update_session_range (r->position (), r->last_frame ()); + } +} + +/** Update the session range markers if a is before the current start or + * b is after the current end. */ void -Session::update_session_range_location_marker () +Session::maybe_update_session_range (framepos_t a, framepos_t b) { if (_state_of_the_state & Loading) { return; } - pair const ext = get_extent (); - if (_session_range_location == 0) { - /* we don't have a session range yet; use this one (provided it is valid) */ - if (ext.first != max_framepos) { - add_session_range_location (ext.first, ext.second); - } + + add_session_range_location (a, b); + } else { - /* update the existing session range */ - if (ext.first < _session_range_location->start()) { - _session_range_location->set_start (ext.first); - set_dirty (); - } - if (ext.second > _session_range_location->end()) { - _session_range_location->set_end (ext.second); - set_dirty (); + if (a < _session_range_location->start()) { + _session_range_location->set_start (a); } + if (b > _session_range_location->end()) { + _session_range_location->set_end (b); + } } } -/** @return Extent of the session's contents; if the session is empty, the first value of - * the pair will equal max_framepos. - */ -pair -Session::get_extent () const +void +Session::playlist_ranges_moved (list > const & ranges) { - pair ext (max_framepos, 0); - - 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->destructive()) { - // ignore tape tracks when getting extents - continue; - } - - pair e = tr->playlist()->get_extent (); - if (e.first < ext.first) { - ext.first = e.first; - } - if (e.second > ext.second) { - ext.second = e.second; - } + for (list >::const_iterator i = ranges.begin(); i != ranges.end(); ++i) { + maybe_update_session_range (i->to, i->to + i->length); } - - return ext; } /* Region management */ @@ -4065,8 +4075,12 @@ Session::start_time_changed (framepos_t old) /* Update the auto loop range to match the session range (unless the auto loop range has been changed by the user) */ - + Location* s = _locations->session_range_location (); + if (s == 0) { + return; + } + Location* l = _locations->auto_loop_location (); if (l->start() == old) { @@ -4082,6 +4096,10 @@ Session::end_time_changed (framepos_t old) */ Location* s = _locations->session_range_location (); + if (s == 0) { + return; + } + Location* l = _locations->auto_loop_location (); if (l->end() == old) { @@ -4189,10 +4207,6 @@ Session::ensure_search_path_includes (const string& path, DataType type) Speakers& Session::get_speakers() { - if (!_speakers) { - _speakers = new Speakers; - } - return *_speakers; }