remove Session::track_by_diskstream_id()

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index fa9d5531a667de13b36a43114372c7b2f8c30789..11d5d3a882fb8800b0e109c60ca43a50b16f508d 100644 (file)
--- 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 43673aa0c2ab7fb0b22b20a964d8808c6a61e630..43f0c95d98937c943b1247f887506c75fbff9a01 100644 (file)
--- 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 28b99fd427548214ede9177bdd79170a7a615eab..a46a63dce900d1e3f28377025c1c25e8c18712d7 100644 (file)
--- 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
 {