remove Track::hidden(); replace with Stripable::is_private_route()

diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h
index 3bc2cc33571721874d3834973dc52ae94584b5eb..b80b97005af33b839342a9bda065f0fec2f091d6 100644 (file)
--- 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 9b9b1c79ee9d0030b4560a4a31d5539f8e9337b7..b7f5c1f5f4638c5acad041f644e0cdf0d601d4c6 100644 (file)
--- 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 a880ff0a097855c08d622a1f3b4dfd10c3e69fbe..d660cf077c76ab40dbc644a85e1f4fc33d5e11c6 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1832,7 +1832,7 @@ Session::set_auto_loop_location (Location* location)
                boost::shared_ptr<RouteList> rl = routes.reader ();
                for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                        boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*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 9229372b4396bdcf106d7fbc55bdce56b89b03f8..2492b9c72f846304ae93310ffe80fd47984d73e1 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -253,7 +253,7 @@ Session::get_track_statistics ()
 
                boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*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 9b3be151e65421e166ca859dc163a4c3447020df..19bfc4c41c44a54c6e2fd9e4f52883f202610019 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -408,7 +408,7 @@ Session::post_engine_init ()
        boost::shared_ptr<RouteList> rl = routes.reader();
        for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
                boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<Track> (*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 869b35a0a0298d95d18b98d6062313e9663eadfb..ca607969472ab928d17bcaf72ce2538f21575405 100644 (file)
--- 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<Track> tr = boost::dynamic_pointer_cast<Track> (*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<RouteList> rl = routes.reader();
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*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 e506e146cf263ae90379c5a18b1b710b96333de1..7423ca4169610a96c10e1ec7af6d07fd38fa1b52 100644 (file)
--- 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);