From 540a12119bc54f26e885f6a9eeeb8ad837e48b9f Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 2 Sep 2014 02:53:05 +0200 Subject: prepare Slider API cleanup --- gtk2_ardour/automation_controller.cc | 2 -- gtk2_ardour/gain_meter.cc | 4 ++-- gtk2_ardour/generic_pluginui.cc | 2 -- gtk2_ardour/latency_gui.cc | 2 -- gtk2_ardour/option_editor.cc | 2 +- gtk2_ardour/processor_box.cc | 2 +- 6 files changed, 4 insertions(+), 10 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index a75faf747c..edc7311c78 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -46,8 +46,6 @@ AutomationController::AutomationController(boost::shared_ptr printe assert (_printer); set_name (X_("PluginSlider")); // FIXME: get yer own name! - set_style (BarController::LeftToRight); - set_use_parent (true); StartGesture.connect (sigc::mem_fun(*this, &AutomationController::start_touch)); StopGesture.connect (sigc::mem_fun(*this, &AutomationController::end_touch)); diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index e647c51bac..2f4942301c 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -78,9 +78,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, false)); + gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth)); } else { - gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth, false)); + gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth)); } level_meter = new LevelMeterHBox(_session); diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 2ecfcca44f..ffdbfb3bf2 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -644,8 +644,6 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptrcontroller->set_size_request (200, req.height); control_ui->controller->set_name (X_("PluginSlider")); - control_ui->controller->set_style (BarController::LeftToRight); - control_ui->controller->set_use_parent (true); control_ui->controller->set_logarithmic (desc.logarithmic); control_ui->controller->StartGesture.connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::start_touch), control_ui)); diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc index d8cf8d051e..bd5499fb2e 100644 --- a/gtk2_ardour/latency_gui.cc +++ b/gtk2_ardour/latency_gui.cc @@ -103,8 +103,6 @@ LatencyGUI::LatencyGUI (Latent& l, framepos_t sr, framepos_t psz) adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &LatencyGUI::finish)); bc.set_size_request (-1, 25); - bc.set_style (BarController::LeftToRight); - bc.set_use_parent (true); bc.set_name (X_("PluginSlider")); set_spacing (12); diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 36ff825c1b..02a930aa7f 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -254,7 +254,7 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot , _get (g) , _set (s) { - _db_slider = manage (new HSliderController (&_db_adjustment, 115, 18, false)); + _db_slider = manage (new HSliderController (&_db_adjustment, 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 1f219352f7..27d020569d 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 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, false) + , _slider (&_adjustment, 0, 13) , _slider_persistant_tooltip (&_slider) , _button (ArdourButton::led_default_elements) , _ignore_ui_adjustment (false) -- cgit v1.2.3