smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki 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

30
gtk2_ardour/gain_meter.cc
View file

@ -121,10 +121,10 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
fader_girth = rint (fader_girth * UIConfiguration::instance().get_ui_scale());
if (horizontal) {
gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
gain_slider = manage (new HSliderController (&gain_adjustment, std::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
gain_slider->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::NoVerticalScroll));
} else {
gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
gain_slider = manage (new VSliderController (&gain_adjustment, std::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
gain_slider->set_tweaks (ArdourFader::NoButtonForward);
}
@ -224,10 +224,10 @@ GainMeterBase::~GainMeterBase ()
}
void
GainMeterBase::set_controls (boost::shared_ptr<Route> r,
boost::shared_ptr<PeakMeter> pm,
boost::shared_ptr<Amp> amp,
boost::shared_ptr<GainControl> control)
GainMeterBase::set_controls (std::shared_ptr<Route> r,
std::shared_ptr<PeakMeter> pm,
std::shared_ptr<Amp> amp,
std::shared_ptr<GainControl> control)
{
connections.clear ();
model_connections.drop_connections ();
@ -236,7 +236,7 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> r,
if (!pm && !control) {
level_meter->set_meter (0);
gain_slider->set_controllable (boost::shared_ptr<PBD::Controllable>());
gain_slider->set_controllable (std::shared_ptr<PBD::Controllable>());
_meter.reset ();
_amp.reset ();
_route.reset ();
@ -992,10 +992,10 @@ GainMeter::GainMeter (Session* s, int fader_length)
GainMeter::~GainMeter () { }
void
GainMeter::set_controls (boost::shared_ptr<Route> r,
boost::shared_ptr<PeakMeter> meter,
boost::shared_ptr<Amp> amp,
boost::shared_ptr<GainControl> control)
GainMeter::set_controls (std::shared_ptr<Route> r,
std::shared_ptr<PeakMeter> meter,
std::shared_ptr<Amp> amp,
std::shared_ptr<GainControl> control)
{
if (meter_hbox.get_parent()) {
hbox.remove (meter_hbox);
@ -1095,13 +1095,13 @@ GainMeter::on_style_changed (const Glib::RefPtr<Gtk::Style>&)
peak_display.queue_draw();
}
boost::shared_ptr<PBD::Controllable>
std::shared_ptr<PBD::Controllable>
GainMeterBase::get_controllable()
{
if (_amp) {
return _control;
} else {
return boost::shared_ptr<PBD::Controllable>();
return std::shared_ptr<PBD::Controllable>();
}
}
@ -1124,8 +1124,8 @@ GainMeter::meter_configuration_changed (ChanCount c)
}
}
bool is_audio_track = _route && boost::dynamic_pointer_cast<AudioTrack>(_route) != 0;
bool is_midi_track = _route && boost::dynamic_pointer_cast<MidiTrack>(_route) != 0;
bool is_audio_track = _route && std::dynamic_pointer_cast<AudioTrack>(_route) != 0;
bool is_midi_track = _route && std::dynamic_pointer_cast<MidiTrack>(_route) != 0;
if (!is_audio_track && (is_midi_track || /* MIDI Bus */ (type == (1 << DataType::MIDI)))) {
if (!_route || _route->active()) {