mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
switch from boost::{shared,weak}_ptr to std::{shared,weak}_ptr
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:
parent
90c5524e7b
commit
b35518e212
819 changed files with 9736 additions and 9709 deletions
|
|
@ -107,7 +107,7 @@ ArdourCtrlBase::on_scroll_event (GdkEventScroll* ev)
|
|||
scale *= -1;
|
||||
}
|
||||
|
||||
boost::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable();
|
||||
std::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable();
|
||||
if (c) {
|
||||
float val = c->get_interface (true);
|
||||
|
||||
|
|
@ -129,7 +129,7 @@ ArdourCtrlBase::on_motion_notify_event (GdkEventMotion *ev)
|
|||
return true;
|
||||
}
|
||||
|
||||
boost::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable();
|
||||
std::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable();
|
||||
if (!c) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -246,7 +246,7 @@ ArdourCtrlBase::on_button_release_event (GdkEventButton *ev)
|
|||
gdk_pointer_ungrab (GDK_CURRENT_TIME);
|
||||
|
||||
if ( (_grabbed_y == ev->y && _grabbed_x == ev->x) && Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { //no move, shift-click sets to default
|
||||
boost::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable();
|
||||
std::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable();
|
||||
if (!c) return false;
|
||||
c->set_value (c->normal(), Controllable::NoGroup);
|
||||
return true;
|
||||
|
|
@ -264,7 +264,7 @@ ArdourCtrlBase::color_handler ()
|
|||
}
|
||||
|
||||
void
|
||||
ArdourCtrlBase::set_controllable (boost::shared_ptr<Controllable> c)
|
||||
ArdourCtrlBase::set_controllable (std::shared_ptr<Controllable> c)
|
||||
{
|
||||
watch_connection.disconnect (); //stop watching the old controllable
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ ArdourCtrlBase::set_controllable (boost::shared_ptr<Controllable> c)
|
|||
void
|
||||
ArdourCtrlBase::controllable_changed (bool force_update)
|
||||
{
|
||||
boost::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable();
|
||||
std::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable();
|
||||
if (!c) return;
|
||||
|
||||
float val = c->get_interface (true);
|
||||
|
|
@ -348,9 +348,9 @@ ArdourCtrlBase::on_enter_notify_event (GdkEventCrossing* ev)
|
|||
|
||||
set_dirty ();
|
||||
|
||||
boost::shared_ptr<PBD::Controllable> c (binding_proxy.get_controllable ());
|
||||
std::shared_ptr<PBD::Controllable> c (binding_proxy.get_controllable ());
|
||||
if (c) {
|
||||
PBD::Controllable::GUIFocusChanged (boost::weak_ptr<PBD::Controllable> (c));
|
||||
PBD::Controllable::GUIFocusChanged (std::weak_ptr<PBD::Controllable> (c));
|
||||
}
|
||||
|
||||
return CairoWidget::on_enter_notify_event (ev);
|
||||
|
|
@ -364,7 +364,7 @@ ArdourCtrlBase::on_leave_notify_event (GdkEventCrossing* ev)
|
|||
set_dirty ();
|
||||
|
||||
if (binding_proxy.get_controllable()) {
|
||||
PBD::Controllable::GUIFocusChanged (boost::weak_ptr<PBD::Controllable> ());
|
||||
PBD::Controllable::GUIFocusChanged (std::weak_ptr<PBD::Controllable> ());
|
||||
}
|
||||
|
||||
return CairoWidget::on_leave_notify_event (ev);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue