allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

switch from boost::{shared,weak}_ptr to std::{shared,weak}_ptr

Browse Source 
This is mostly a simple lexical search+replace but the absence of operator< for
std::weak_ptr<T> leads to some complications, particularly with Evoral::Sequence
and ExportPortChannel.
This commit is contained in:
Paul Davis
2023-02-16 16:33:28 -07:00
parent 90c5524e7b
commit b35518e212
819 changed files with 9736 additions and 9709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h
View File

@@ -194,7 +194,7 @@ class LIBCONTROLCP_API BasicUI {
void unbang_trigger_at (int x, int y);
/* it would be nice to use TriggerPtr here but that implies including ardour/triggerbox.h */
boost::shared_ptr<ARDOUR::Trigger> find_trigger (int x, int y);
std::shared_ptr<ARDOUR::Trigger> find_trigger (int x, int y);
protected:
BasicUI ();

16
libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h
View File

@@ -83,10 +83,10 @@ public:
static PBD::Signal0<void> StepTracksDown;
static PBD::Signal0<void> StepTracksUp;
void add_stripable_to_selection (boost::shared_ptr<ARDOUR::Stripable>);
void set_stripable_selection (boost::shared_ptr<ARDOUR::Stripable>);
void toggle_stripable_selection (boost::shared_ptr<ARDOUR::Stripable>);
void remove_stripable_from_selection (boost::shared_ptr<ARDOUR::Stripable>);
void add_stripable_to_selection (std::shared_ptr<ARDOUR::Stripable>);
void set_stripable_selection (std::shared_ptr<ARDOUR::Stripable>);
void toggle_stripable_selection (std::shared_ptr<ARDOUR::Stripable>);
void remove_stripable_from_selection (std::shared_ptr<ARDOUR::Stripable>);
void clear_stripable_selection ();
virtual void add_rid_to_selection (int rid);
@@ -94,7 +94,7 @@ public:
virtual void toggle_rid_selection (int rid);
virtual void remove_rid_from_selection (int rid);
boost::shared_ptr<ARDOUR::Stripable> first_selected_stripable () const;
std::shared_ptr<ARDOUR::Stripable> first_selected_stripable () const;
/* the model here is as follows:
@@ -113,7 +113,7 @@ public:
*/
void set_route_table_size (uint32_t size);
void set_route_table (uint32_t table_index, boost::shared_ptr<ARDOUR::Route>);
void set_route_table (uint32_t table_index, std::shared_ptr<ARDOUR::Route>);
bool set_route_table (uint32_t table_index, uint32_t remote_control_id);
void route_set_rec_enable (uint32_t table_index, bool yn);
@@ -133,7 +133,7 @@ public:
std::string route_get_name (uint32_t table_index);
virtual std::list<boost::shared_ptr<ARDOUR::Bundle> > bundles ();
virtual std::list<std::shared_ptr<ARDOUR::Bundle> > bundles ();
virtual bool has_editor () const { return false; }
virtual void* get_gui () const { return 0; }
@@ -151,7 +151,7 @@ protected:
void next_track (uint32_t initial_id);
void prev_track (uint32_t initial_id);
std::vector<boost::shared_ptr<ARDOUR::Route> > route_table;
std::vector<std::shared_ptr<ARDOUR::Route> > route_table;
std::string _name;
GlibEventLoopCallback glib_event_callback;
virtual void event_loop_precall ();

12
libs/ctrl-interface/control_protocol/control_protocol/types.h
View File

@@ -26,13 +26,13 @@ namespace ARDOUR {
class Route;
class Stripable;
typedef std::vector<boost::weak_ptr<ARDOUR::Route> > RouteNotificationList;
typedef boost::shared_ptr<RouteNotificationList> RouteNotificationListPtr;
typedef std::vector<boost::shared_ptr<ARDOUR::Route> > StrongRouteNotificationList;
typedef std::vector<std::weak_ptr<ARDOUR::Route> > RouteNotificationList;
typedef std::shared_ptr<RouteNotificationList> RouteNotificationListPtr;
typedef std::vector<std::shared_ptr<ARDOUR::Route> > StrongRouteNotificationList;
typedef std::vector<boost::weak_ptr<ARDOUR::Stripable> > StripableNotificationList;
typedef boost::shared_ptr<StripableNotificationList> StripableNotificationListPtr;
typedef std::vector<boost::shared_ptr<ARDOUR::Stripable> > StrongStripableNotificationList;
typedef std::vector<std::weak_ptr<ARDOUR::Stripable> > StripableNotificationList;
typedef std::shared_ptr<StripableNotificationList> StripableNotificationListPtr;
typedef std::vector<std::shared_ptr<ARDOUR::Stripable> > StrongStripableNotificationList;
}
#endif /* __ardour_control_protocol_types_h__ */