From 1f53c861b85ef07e60fb589a1c28efbc159e1a5c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 25 Jul 2017 11:26:14 -0400 Subject: remove Track::hidden(); replace with Stripable::is_private_route() --- libs/ardour/ardour/stripable.h | 1 + libs/ardour/ardour/track.h | 1 - libs/ardour/session.cc | 2 +- libs/ardour/session_process.cc | 2 +- libs/ardour/session_state.cc | 2 +- libs/ardour/session_transport.cc | 4 ++-- libs/ardour/track.cc | 10 ++-------- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h index 3bc2cc3357..b80b97005a 100644 --- a/libs/ardour/ardour/stripable.h +++ b/libs/ardour/ardour/stripable.h @@ -71,6 +71,7 @@ class LIBARDOUR_API Stripable : public SessionObject, */ bool is_auditioner() const { return _presentation_info.flags() & PresentationInfo::Auditioner; } + bool is_private_route() const { return is_auditioner(); } bool is_master() const { return _presentation_info.flags() & PresentationInfo::MasterOut; } bool is_monitor() const { return _presentation_info.flags() & PresentationInfo::MonitorOut; } diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 9b9b1c79ee..b7f5c1f5f4 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -154,7 +154,6 @@ class LIBARDOUR_API Track : public Route, public Recordable int do_flush (RunContext, bool force = false); void set_pending_overwrite (bool); int seek (framepos_t, bool complete_refill = false); - bool hidden () const; int can_internal_playback_seek (framecnt_t); int internal_playback_seek (framecnt_t); void non_realtime_locate (framepos_t); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index a880ff0a09..d660cf077c 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1832,7 +1832,7 @@ Session::set_auto_loop_location (Location* location) 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->hidden()) { + if (tr && !tr->is_private_route()) { tr->set_loop (location); } } diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 9229372b43..2492b9c72f 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -253,7 +253,7 @@ Session::get_track_statistics () boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); - if (!tr || tr->hidden()) { + if (!tr || tr->is_private_route()) { continue; } diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 9b3be151e6..19bfc4c41c 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -408,7 +408,7 @@ Session::post_engine_init () boost::shared_ptr rl = routes.reader(); for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { boost::shared_ptr trk = boost::dynamic_pointer_cast (*r); - if (trk && !trk->hidden()) { + if (trk && !trk->is_private_route()) { trk->seek (_transport_frame, true); } } diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 869b35a0a0..ca60796947 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -1035,7 +1035,7 @@ Session::set_track_loop (bool yn) for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); - if (tr && !tr->hidden()) { + if (tr && !tr->is_private_route()) { tr->set_loop (yn ? loc : 0); } } @@ -1863,7 +1863,7 @@ Session::use_sync_source (Slave* new_slave) 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->hidden()) { + if (tr && !tr->is_private_route()) { if (tr->realtime_speed_change()) { non_rt_required = true; } diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index e506e146cf..7423ca4169 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -700,12 +700,6 @@ Track::seek (framepos_t p, bool complete_refill) return _disk_writer->seek (p, complete_refill); } -bool -Track::hidden () const -{ - return _disk_writer->hidden () || _disk_reader->hidden(); -} - int Track::can_internal_playback_seek (framecnt_t p) { @@ -723,9 +717,9 @@ Track::non_realtime_locate (framepos_t p) { Route::non_realtime_locate (p); - if (!hidden()) { + if (!is_private_route()) { /* don't waste i/o cycles and butler calls - for hidden (secret) tracks + for private tracks (e.g.auditioner) */ _disk_reader->non_realtime_locate (p); _disk_writer->non_realtime_locate (p); -- cgit v1.2.3