smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

prepare Slider API cleanup

Browse source
This commit is contained in:
Robin Gareus 2014-09-02 02:53:05 +02:00
parent 001e4ca684
commit 540a12119b
6 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/automation_controller.cc
View file

@ -46,8 +46,6 @@ AutomationController::AutomationController(boost::shared_ptr<Automatable> printe
assert (_printer); assert (_printer);
set_name (X_("PluginSlider")); // FIXME: get yer own name! 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)); StartGesture.connect (sigc::mem_fun(*this, &AutomationController::start_touch));
StopGesture.connect (sigc::mem_fun(*this, &AutomationController::end_touch)); StopGesture.connect (sigc::mem_fun(*this, &AutomationController::end_touch));

4
gtk2_ardour/gain_meter.cc
View file

@ -78,9 +78,9 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
_width = Wide; _width = Wide;
if (horizontal) { 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 { } 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); level_meter = new LevelMeterHBox(_session);

2
gtk2_ardour/generic_pluginui.cc
View file

@ -644,8 +644,6 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
control_ui->controller->set_size_request (200, req.height); control_ui->controller->set_size_request (200, req.height);
control_ui->controller->set_name (X_("PluginSlider")); 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->set_logarithmic (desc.logarithmic);
control_ui->controller->StartGesture.connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::start_touch), control_ui)); control_ui->controller->StartGesture.connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::start_touch), control_ui));

2
gtk2_ardour/latency_gui.cc
View file

@ -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)); adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &LatencyGUI::finish));
bc.set_size_request (-1, 25); bc.set_size_request (-1, 25);
bc.set_style (BarController::LeftToRight);
bc.set_use_parent (true);
bc.set_name (X_("PluginSlider")); bc.set_name (X_("PluginSlider"));
set_spacing (12); set_spacing (12);

2
gtk2_ardour/option_editor.cc
View file

@ -254,7 +254,7 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t>
, _get (g) , _get (g)
, _set (s) , _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_text (n + ":");
_label.set_alignment (0, 0.5); _label.set_alignment (0, 0.5);

2
gtk2_ardour/processor_box.cc
View file

@ -493,7 +493,7 @@ ProcessorEntry::toggle_panner_link ()
ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string const & n) ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string const & n)
: _control (c) : _control (c)
, _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1) , _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) , _slider_persistant_tooltip (&_slider)
, _button (ArdourButton::led_default_elements) , _button (ArdourButton::led_default_elements)
, _ignore_ui_adjustment (false) , _ignore_ui_adjustment (false)