Allow drags of automation in time ranges where the automation is on a MIDI track...

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index c2937acec215228d785e9e34acb7456b6d7cd3e2..82c544c50cb90d0c554fe2efea4315572e302c04 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -1,4 +1,4 @@
- /*
+/*
     Copyright (C) 2001-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
@@ -19,14 +19,18 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/alignment.h>
+#include "gtkmm2ext/utils.h"
 #include "ardour/configuration.h"
+#include "ardour/utils.h"
+#include "ardour/dB.h"
 #include "option_editor.h"
 #include "gui_thread.h"
+#include "utils.h"
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace Gtk;
+using namespace Gtkmm2ext;
 using namespace ARDOUR;
 
 void
@@ -71,14 +75,14 @@ OptionEditorBox::add_to_page (OptionEditorPage* p)
        add_widget_to_page (p, _box);
 }
 
-BoolOption::BoolOption (string const & i, string const & n, slot<bool> g, slot<bool, bool> s)
+BoolOption::BoolOption (string const & i, string const & n, sigc::slot<bool> g, sigc::slot<bool, bool> s)
        : Option (i, n),
          _get (g),
          _set (s)
 {
        _button = manage (new CheckButton (n));
        _button->set_active (_get ());
-       _button->signal_toggled().connect (mem_fun (*this, &BoolOption::toggled));
+       _button->signal_toggled().connect (sigc::mem_fun (*this, &BoolOption::toggled));
 }
 
 void
@@ -99,7 +103,7 @@ BoolOption::toggled ()
        _set (_button->get_active ());
 }
 
-EntryOption::EntryOption (string const & i, string const & n, slot<string> g, slot<bool, string> s)
+EntryOption::EntryOption (string const & i, string const & n, sigc::slot<string> g, sigc::slot<bool, string> s)
        : Option (i, n),
          _get (g),
          _set (s)
@@ -107,7 +111,7 @@ EntryOption::EntryOption (string const & i, string const & n, slot<string> g, sl
        _label = manage (new Label (n + ":"));
        _label->set_alignment (1, 0.5);
        _entry = manage (new Entry);
-       _entry->signal_activate().connect (mem_fun (*this, &EntryOption::activated));
+       _entry->signal_activate().connect (sigc::mem_fun (*this, &EntryOption::activated));
 }
 
 void
@@ -128,6 +132,65 @@ EntryOption::activated ()
        _set (_entry->get_text ());
 }
 
+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)
+       , _get (g)
+       , _set (s)
+{
+       _pix = ::get_icon (X_("fader_belt_h"));
+       if (_pix == 0) {
+               throw failed_constructor ();
+       }
+
+       _db_slider = manage (new HSliderController (_pix,
+                                                   &_db_adjustment,
+                                                   115,
+                                                   false));
+
+       _label.set_text (n + ":");
+       _label.set_name (X_("OptionsLabel"));
+
+       _box.set_spacing (4);
+       _box.pack_start (*_db_slider, false, false);
+       _box.pack_start (_db_display, false, false);
+       _box.show_all ();
+       
+       set_size_request_to_display_given_text (_db_display, "-99.0", 12, 12);
+
+       _db_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &FaderOption::db_changed));
+}
+
+void
+FaderOption::set_state_from_config ()
+{
+       gain_t const val = _get ();
+       _db_adjustment.set_value (gain_to_slider_position (val));
+
+       char buf[16];
+
+       if (val == 0.0) {
+               snprintf (buf, sizeof (buf), "-inf");
+       } else {
+               snprintf (buf, sizeof (buf), "%.2f", accurate_coefficient_to_dB (val));
+       }
+       
+       _db_display.set_text (buf);
+}
+
+void
+FaderOption::db_changed ()
+{
+       _set (slider_position_to_gain (_db_adjustment.get_value ()));
+}
+
+void
+FaderOption::add_to_page (OptionEditorPage* p)
+{
+       add_widgets_to_page (p, &_label, &_box);
+}
+
 OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
        : table (1, 3)
 {
@@ -148,7 +211,7 @@ OptionEditor::OptionEditor (Configuration* c, std::string const & t)
        using namespace Notebook_Helpers;
 
        set_default_size (300, 300);
-       set_wmclass (X_("ardour_preferences"), "Ardour");
+       set_wmclass (X_("ardour_preferences"), PROGRAM_NAME);
 
        set_name ("Preferences");
        add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);
@@ -165,7 +228,7 @@ OptionEditor::OptionEditor (Configuration* c, std::string const & t)
        show_all_children();
 
        /* Watch out for changes to parameters */
-       _config->ParameterChanged.connect (mem_fun (*this, &OptionEditor::parameter_changed));
+       _config->ParameterChanged.connect (config_connection, invalidator (*this), ui_bind (&OptionEditor::parameter_changed, this, _1), gui_context());
 }
 
 OptionEditor::~OptionEditor ()
@@ -184,7 +247,7 @@ OptionEditor::~OptionEditor ()
 void
 OptionEditor::parameter_changed (std::string const & p)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &OptionEditor::parameter_changed), p));
+       ENSURE_GUI_THREAD (*this, &OptionEditor::parameter_changed, p)
 
        for (std::map<std::string, OptionEditorPage*>::iterator i = _pages.begin(); i != _pages.end(); ++i) {
                for (std::list<OptionEditorComponent*>::iterator j = i->second->components.begin(); j != i->second->components.end(); ++j) {