::find_next_event() does not need to be a pure virtual in ControlSet (it can originat...
[ardour.git] / gtk2_ardour / rc_option_editor.cc
index 84034ae6331dec5992c4482d91e87bbd60aebaa9..787cfcd07d20daa4257b5a0e18e846cb419bef9d 100644 (file)
 #include <gtkmm/stock.h>
 #include <gtkmm/scale.h>
 
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/slider_controller.h>
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/paths_dialog.h>
-#include <gtkmm2ext/window_title.h>
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/window_title.h"
 
 #include "pbd/fpu.h"
 #include "pbd/cpus.h"
 #include "ardour/plugin_manager.h"
 #include "control_protocol/control_protocol.h"
 
-#include "canvas/wave_view.h"
+#include "waveview/wave_view.h"
+
+#include "widgets/paths_dialog.h"
+#include "widgets/tooltips.h"
 
 #include "ardour_dialog.h"
 #include "ardour_ui.h"
@@ -65,7 +66,6 @@
 #include "midi_tracer.h"
 #include "rc_option_editor.h"
 #include "sfdb_ui.h"
-#include "tooltips.h"
 #include "ui_config.h"
 #include "utils.h"
 
@@ -75,6 +75,7 @@ using namespace Gtkmm2ext;
 using namespace PBD;
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 
 class ClickOptions : public OptionEditorMiniPage
 {
@@ -1197,7 +1198,7 @@ private:
        {
                UIConfiguration::instance().set_waveform_clip_level (_clip_level_adjustment.get_value());
                /* XXX: should be triggered from the parameter changed signal */
-               ArdourCanvas::WaveView::set_clip_level (_clip_level_adjustment.get_value());
+               ArdourWaveView::WaveView::set_clip_level (_clip_level_adjustment.get_value());
        }
 
        Adjustment _clip_level_adjustment;
@@ -1374,7 +1375,7 @@ class ControlSurfacesOptions : public OptionEditorMiniPage
                                if (!(*i)->mandatory) {
                                        TreeModel::Row r = *_store->append ();
                                        r[_model.name] = (*i)->name;
-                                       r[_model.enabled] = ((*i)->protocol || (*i)->requested);
+                                       r[_model.enabled] = 0 != (*i)->protocol;
                                        r[_model.protocol_info] = *i;
                                }
                        }
@@ -1391,8 +1392,9 @@ class ControlSurfacesOptions : public OptionEditorMiniPage
 
                                if ((*x)[_model.protocol_info] == cpi) {
                                        _ignore_view_change++;
-                                       (*x)[_model.enabled] = (cpi->protocol || cpi->requested);
+                                       (*x)[_model.enabled] = 0 != cpi->protocol;
                                        _ignore_view_change--;
+                                       selection_changed (); // update sensitivity
                                        break;
                                }
                        }
@@ -1535,7 +1537,7 @@ class VideoTimelineOptions : public OptionEditorMiniPage
                        t->attach (_video_advanced_setup_button, 1, 4, n, n + 1, FILL);
                        _video_advanced_setup_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::video_advanced_setup_toggled));
                        Gtkmm2ext::UI::instance()->set_tip (_video_advanced_setup_button,
-                                       _("<b>When enabled</b> you can speficify a custom video-server URL and docroot. - Do not enable this option unless you know what you are doing."));
+                                       _("<b>When enabled</b> you can specify a custom video-server URL and docroot. - Do not enable this option unless you know what you are doing."));
                        ++n;
 
                        Label* l = manage (new Label (_("Video Server URL:")));
@@ -1551,7 +1553,7 @@ class VideoTimelineOptions : public OptionEditorMiniPage
                        t->attach (*l, 1, 2, n, n + 1, FILL);
                        t->attach (_video_server_docroot_entry, 2, 4, n, n + 1);
                        Gtkmm2ext::UI::instance()->set_tip (_video_server_docroot_entry,
-                                       _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unvailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
+                                       _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unavailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
                        ++n;
 
                        l = manage (new Label (""));
@@ -2330,6 +2332,33 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead)
                     ));
 
+       ComboOption<float>* dps = new ComboOption<float> (
+                    "draggable-playhead-speed",
+                    _("Playhead dragging speed (%)"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_draggable_playhead_speed),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_draggable_playhead_speed)
+                    );
+       dps->add (0.05, _("5%"));
+       dps->add (0.1, _("10%"));
+       dps->add (0.25, _("25%"));
+       dps->add (0.5, _("50%"));
+       dps->add (1.0, _("100%"));
+       add_option (_("Editor"), dps);
+
+       ComboOption<float>* eet = new ComboOption<float> (
+                    "extra-ui-extents-time",
+                    _("Limit zooming & summary view to X minutes beyond session extents"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_extra_ui_extents_time),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_extra_ui_extents_time)
+                    );
+       eet->add (1, _("1 minute"));
+       eet->add (2, _("2 minutes"));
+       eet->add (20, _("20 minutes"));
+       eet->add (60, _("1 hour"));
+       eet->add (60*2, _("2 hours"));
+       eet->add (60*24, _("24 hours"));
+       add_option (_("Editor"), eet);
+
        if (!Profile->get_mixbus()) {
 
                add_option (_("Editor"),
@@ -2393,6 +2422,16 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions)
                     ));
 
+       bo = new BoolOption (
+                    "new-automation-points-on-lane",
+                    _("Ignore Y-axis click position when adding new automation-points"),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_new_automation_points_on_lane),
+                    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_new_automation_points_on_lane)
+                    );
+       add_option (_("Editor"), bo);
+       Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
+                       _("<b>When enabled</b> The new points drawn in any automation lane will be placed on the existing line, regardless of mouse y-axis position."));
+
        ComboOption<FadeShape>* fadeshape = new ComboOption<FadeShape> (
                        "default-fade-shape",
                        _("Default fade shape"),
@@ -3018,7 +3057,7 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
                     );
        Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
-                       _("<b>When enabled</b> rhis will reduce the unpleasant increase in perceived volume "
+                       _("<b>When enabled</b> this will reduce the unpleasant increase in perceived volume "
                                "that occurs when fast-forwarding or rewinding through some kinds of audio"));
        add_option (_("Transport"), bo);
 
@@ -3092,7 +3131,7 @@ RCOptionEditor::RCOptionEditor ()
 
        /* SYNC */
 
-       add_option (_("Sync"), new OptionEditorHeading (_("External Syncronization")));
+       add_option (_("Sync"), new OptionEditorHeading (_("External Synchronization")));
 
        _sync_source = new ComboOption<SyncSource> (
                "sync-source",
@@ -3984,7 +4023,7 @@ void RCOptionEditor::clear_au_blacklist () {
 
 void RCOptionEditor::edit_lxvst_path () {
        Glib::RefPtr<Gdk::Window> win = get_parent_window ();
-       Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+       PathsDialog *pd = new PathsDialog (
                *current_toplevel(), _("Set Linux VST Search Path"),
                _rc_config->get_plugin_path_lxvst(),
                PluginManager::instance().get_default_lxvst_path()
@@ -4006,7 +4045,7 @@ void RCOptionEditor::edit_lxvst_path () {
 }
 
 void RCOptionEditor::edit_vst_path () {
-       Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
+       PathsDialog *pd = new PathsDialog (
                *current_toplevel(), _("Set Windows VST Search Path"),
                _rc_config->get_plugin_path_vst(),
                PluginManager::instance().get_default_windows_vst_path()