Editor zoom: add 2hour and 24hour zoom limits.

[ardour.git] / gtk2_ardour / rc_option_editor.cc

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index b69cddf89eee310a1d2fe4fd1ccfa115cfa90540..787cfcd07d20daa4257b5a0e18e846cb419bef9d 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -51,7 +51,7 @@
 #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"
@@ -1198,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;
@@ -2332,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"),