diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-19 23:02:55 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-19 23:02:55 +0000 |
commit | d5e09076ca69fda1402a12e383de7a7d9bc5f0ec (patch) | |
tree | 0d4df7147098ea57e58d96efb82f57dd5545023c /gtk2_ardour/option_editor.cc | |
parent | 182b23e744d79b3387a779ea25010924daffe6af (diff) |
much ado about nothing when it comes to gain control
git-svn-id: svn://localhost/ardour2/branches/3.0@9748 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/option_editor.cc')
-rw-r--r-- | gtk2_ardour/option_editor.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index ffdbdc4e95..33f8a8dc43 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -20,9 +20,12 @@ #include <gtkmm/box.h> #include <gtkmm/alignment.h> #include "gtkmm2ext/utils.h" + #include "ardour/configuration.h" +#include "ardour/rc_configuration.h" #include "ardour/utils.h" #include "ardour/dB.h" + #include "option_editor.h" #include "gui_thread.h" #include "utils.h" @@ -134,8 +137,7 @@ EntryOption::activated () FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t> g, sigc::slot<bool, gain_t> s) : Option (i, n) - // 0.781787 is the value needed for gain to be set to 0. - , _db_adjustment (0.781787, 0, 1, 0.01, 0.1) + , _db_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1) , _get (g) , _set (s) { @@ -166,7 +168,7 @@ void FaderOption::set_state_from_config () { gain_t const val = _get (); - _db_adjustment.set_value (gain_to_slider_position (val)); + _db_adjustment.set_value (gain_to_slider_position_with_max (val, Config->get_max_gain ())); char buf[16]; @@ -182,7 +184,7 @@ FaderOption::set_state_from_config () void FaderOption::db_changed () { - _set (slider_position_to_gain (_db_adjustment.get_value ())); + _set (slider_position_to_gain_with_max (_db_adjustment.get_value (), Config->get_max_gain())); } void |