use correct types in arguments to Session::get_remote_nth...()
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 17 May 2016 19:26:35 +0000 (15:26 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 31 May 2016 19:30:43 +0000 (15:30 -0400)
libs/ardour/ardour/session.h
libs/ardour/session.cc

index fbac73ae754e1693aaee9cefcca39c23751a7e3a..f35e3b6f193769668923a41b388604a8fd8c07fd 100644 (file)
@@ -311,8 +311,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
        bool io_name_is_legal (const std::string&) const;
        boost::shared_ptr<Route> route_by_name (std::string) const;
        boost::shared_ptr<Route> route_by_id (PBD::ID) const;
-       boost::shared_ptr<Stripable> get_remote_nth_stripable (uint16_t n, PresentationInfo::Flag) const;
-       boost::shared_ptr<Route> get_remote_nth_route (uint16_t n) const;
+       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);
index e24d0a3ef0b60f2cc812604dc96e1b838d6e84ea..6caa41e9ed917de6e039215d8c72fb4ee912293c 100644 (file)
@@ -4208,7 +4208,7 @@ Session::track_by_diskstream_id (PBD::ID id) const
 }
 
 boost::shared_ptr<Route>
-Session::get_remote_nth_route (uint16_t n) const
+Session::get_remote_nth_route (PresentationInfo::order_t n) const
 {
        return boost::dynamic_pointer_cast<Route> (get_remote_nth_stripable (n, PresentationInfo::Route));
 }
@@ -4220,10 +4220,10 @@ struct GlobalPresentationOrderSorter {
 };
 
 boost::shared_ptr<Stripable>
-Session::get_remote_nth_stripable (uint16_t n, PresentationInfo::Flag flags) const
+Session::get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo::Flag flags) const
 {
        StripableList sl;
-       uint32_t match_cnt = 0;
+       PresentationInfo::order_t match_cnt = 0;
 
        /* API is one-based, so adjust n */