use "mute" not cut in monitor section

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index ffdbdc4e95bf67ae66d481cf4c6906d890934005..50feba34844a931306b0c56dc9ba6e943628a27f 100644 (file)
--- 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
@@ -193,7 +195,7 @@ FaderOption::add_to_page (OptionEditorPage* p)
 
 ClockOption::ClockOption (string const & i, string const & n, sigc::slot<framecnt_t> g, sigc::slot<bool, framecnt_t> s)
        : Option (i, n)
-       , _clock (X_("timecode-offset"), false, X_("TimecodeOffset"), true, false, true, false)
+       , _clock (X_("timecode-offset"), false, X_("TimecodeOffsetClock"), true, false, true, false)
        , _get (g)
        , _set (s)
 {
@@ -318,4 +320,30 @@ OptionEditor::set_current_page (string const & p)
 }
 
 
+DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot<string> g, sigc::slot<bool, string> s)
+       : Option (i, n)
+       , _get (g)
+       , _set (s)
+{
+       _file_chooser.set_action (Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
+       _file_chooser.signal_file_set().connect (sigc::mem_fun (*this, &DirectoryOption::file_set));
+}
+
 
+void
+DirectoryOption::set_state_from_config ()
+{
+       _file_chooser.set_filename (_get ());
+}
+
+void
+DirectoryOption::add_to_page (OptionEditorPage* p)
+{
+       add_widgets_to_page (p, manage (new Label (_name)), &_file_chooser);
+}
+
+void
+DirectoryOption::file_set ()
+{
+       _set (_file_chooser.get_filename ());
+}