From 11baba02750816fd83c50a7dc5acb5f147f91929 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 3 Apr 2017 23:33:27 +0200
Subject: remove Session::track_by_diskstream_id()

---
 gtk2_ardour/playlist_selector.cc | 12 ------------
 libs/ardour/ardour/session.h     |  1 -
 libs/ardour/session.cc           | 15 ---------------
 3 files changed, 28 deletions(-)

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index fa9d5531a6..11d5d3a882 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -119,18 +119,6 @@ PlaylistSelector::show_for (RouteUI* ruix)
 
 		boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (_session->route_by_id (x->first));
 
-		/* legacy sessions stored the diskstream ID as the original
-		 * playlist owner. so try there instead.
-		 */
-
-		if (tr == 0) {
-			tr = _session->track_by_diskstream_id (x->first);
-		}
-
-		if (tr == 0) {
-			continue;
-		}
-
 		/* add a node for the track */
 
 		string nodename;
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 43673aa0c2..43f0c95d98 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -328,7 +328,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 	boost::shared_ptr<Stripable> get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo::Flag) const;
 	boost::shared_ptr<Route> get_remote_nth_route (PresentationInfo::order_t n) const;
 	boost::shared_ptr<Route> route_by_selected_count (uint32_t cnt) const;
-	boost::shared_ptr<Track> track_by_diskstream_id (PBD::ID) const;
 	void routes_using_input_from (const std::string& str, RouteList& rl);
 
 	bool route_name_unique (std::string) const;
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 28b99fd427..a46a63dce9 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -4534,21 +4534,6 @@ Session::processor_by_id (PBD::ID id) const
 	return boost::shared_ptr<Processor> ();
 }
 
-boost::shared_ptr<Track>
-Session::track_by_diskstream_id (PBD::ID id) const
-{
-	boost::shared_ptr<RouteList> r = routes.reader ();
-
-	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-		boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*i);
-		if (t && t->using_diskstream_id (id)) {
-			return t;
-		}
-	}
-
-	return boost::shared_ptr<Track> ();
-}
-
 boost::shared_ptr<Route>
 Session::get_remote_nth_route (PresentationInfo::order_t n) const
 {
-- 
cgit v1.2.3