diff options
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/barcontroller.cc | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/slider_controller.h | 6 | ||||
| -rw-r--r-- | libs/gtkmm2ext/slider_controller.cc | 11 |
6 files changed, 14 insertions, 13 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 00c64d02f6..daba2e77d4 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -98,9 +98,9 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int _width = Wide; if (horizontal) { - gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth)); + gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth)); } else { - gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth)); + gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth)); } level_meter = new LevelMeterHBox(_session); diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index ef09b22898..137d6b98c8 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -267,7 +267,7 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t> , _get (g) , _set (s) { - _db_slider = manage (new HSliderController (&_db_adjustment, 115, 18)); + _db_slider = manage (new HSliderController (&_db_adjustment, boost::shared_ptr<PBD::Controllable>(), 115, 18)); _label.set_text (n + ":"); _label.set_alignment (0, 0.5); diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 1fdad0801d..84507b250c 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -493,7 +493,7 @@ ProcessorEntry::toggle_panner_link () ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string const & n) : _control (c) , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1) - , _slider (&_adjustment, 0, 13) + , _slider (&_adjustment, boost::shared_ptr<PBD::Controllable>(), 0, 13) , _slider_persistant_tooltip (&_slider) , _button (ArdourButton::led_default_elements) , _ignore_ui_adjustment (false) diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc index 5ac5821205..bb20cae922 100644 --- a/libs/gtkmm2ext/barcontroller.cc +++ b/libs/gtkmm2ext/barcontroller.cc @@ -39,7 +39,7 @@ using namespace Gtkmm2ext; BarController::BarController (Gtk::Adjustment& adj, boost::shared_ptr<PBD::Controllable> mc) - : _slider (&adj, 60, 16) + : _slider (&adj, mc, 60, 16) , _switching (false) , _switch_on_release (false) { diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h index 2b4205c2ca..f67960babd 100644 --- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h +++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h @@ -45,7 +45,7 @@ namespace Gtkmm2ext { class LIBGTKMM2EXT_API SliderController : public Gtkmm2ext::PixFader { public: - SliderController (Gtk::Adjustment* adj, int orientation, int, int); + SliderController (Gtk::Adjustment* adj, boost::shared_ptr<PBD::Controllable> mc, int orientation, int, int); virtual ~SliderController () {} @@ -61,13 +61,13 @@ class LIBGTKMM2EXT_API SliderController : public Gtkmm2ext::PixFader class LIBGTKMM2EXT_API VSliderController : public SliderController { public: - VSliderController (Gtk::Adjustment *adj, int, int); + VSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int, int); }; class LIBGTKMM2EXT_API HSliderController : public SliderController { public: - HSliderController (Gtk::Adjustment *adj, int, int); + HSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int, int); }; diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc index 4fd78d095f..ab629f411a 100644 --- a/libs/gtkmm2ext/slider_controller.cc +++ b/libs/gtkmm2ext/slider_controller.cc @@ -22,13 +22,14 @@ #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/pixfader.h> #include <gtkmm2ext/slider_controller.h> +#include "pbd/controllable.h" #include "i18n.h" using namespace Gtkmm2ext; using namespace PBD; -SliderController::SliderController (Gtk::Adjustment *adj, int orientation, int fader_length, int fader_girth) +SliderController::SliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int orientation, int fader_length, int fader_girth) : PixFader (*adj, orientation, fader_length, fader_girth) , spin (*adj, 0, 2) { @@ -47,12 +48,12 @@ SliderController::on_button_press_event (GdkEventButton *ev) return PixFader::on_button_press_event (ev); } -VSliderController::VSliderController (Gtk::Adjustment *adj, int fader_length, int fader_girth) - : SliderController (adj, VERT, fader_length, fader_girth) +VSliderController::VSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int fader_length, int fader_girth) + : SliderController (adj, mc, VERT, fader_length, fader_girth) { } -HSliderController::HSliderController (Gtk::Adjustment *adj, int fader_length, int fader_girth) - : SliderController (adj, HORIZ, fader_length, fader_girth) +HSliderController::HSliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int fader_length, int fader_girth) + : SliderController (adj, mc, HORIZ, fader_length, fader_girth) { } |