From 7f4880ad12222b113e305fa2f690bc6b113ab975 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 17 May 2016 15:26:35 -0400 Subject: [PATCH] use correct types in arguments to Session::get_remote_nth...() --- libs/ardour/ardour/session.h | 4 ++-- libs/ardour/session.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index fbac73ae75..f35e3b6f19 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -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_by_name (std::string) const; boost::shared_ptr route_by_id (PBD::ID) const; - boost::shared_ptr get_remote_nth_stripable (uint16_t n, PresentationInfo::Flag) const; - boost::shared_ptr get_remote_nth_route (uint16_t n) const; + boost::shared_ptr get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo::Flag) const; + boost::shared_ptr get_remote_nth_route (PresentationInfo::order_t n) const; boost::shared_ptr route_by_selected_count (uint32_t cnt) const; boost::shared_ptr track_by_diskstream_id (PBD::ID) const; void routes_using_input_from (const std::string& str, RouteList& rl); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index e24d0a3ef0..6caa41e9ed 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -4208,7 +4208,7 @@ Session::track_by_diskstream_id (PBD::ID id) const } boost::shared_ptr -Session::get_remote_nth_route (uint16_t n) const +Session::get_remote_nth_route (PresentationInfo::order_t n) const { return boost::dynamic_pointer_cast (get_remote_nth_stripable (n, PresentationInfo::Route)); } @@ -4220,10 +4220,10 @@ struct GlobalPresentationOrderSorter { }; boost::shared_ptr -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 */ -- 2.30.2