ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

new UI config var to allow playhead to be optionally draggable (default is: yes, it can be dragged)

This commit is contained in:
Paul Davis 2014-06-30 16:32:38 -04:00
parent d816c225a4
commit e8fc8aa992
5 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/editor.cc
View File

@ -121,6 +121,7 @@
#include "tempo_lines.h"
#include "time_axis_view.h"
#include "utils.h"
#include "verbose_cursor.h"
#include "i18n.h"
@ -760,9 +761,14 @@ Editor::Editor ()
}
constructed = true;
instant_save ();
/* grab current parameter state */
boost::function<void (string)> pc (boost::bind (&Editor::ui_parameter_changed, this, _1));
ARDOUR_UI::config()->map_parameters (pc);
setup_fade_images ();
instant_save ();
}
Editor::~Editor()
@ -5506,5 +5512,9 @@ Editor::ui_parameter_changed (string parameter)
_cursor_stack.pop();
}
_cursors->set_cursor_set (ARDOUR_UI::config()->get_icon_set());
} else if (parameter == "draggable-playhead") {
if (_verbose_cursor) {
playhead_cursor->set_sensitive (ARDOUR_UI::config()->get_draggable_playhead());
}
}
}

6
gtk2_ardour/editor_cursors.cc
View File

@ -88,3 +88,9 @@ EditorCursor::set_color (ArdourCanvas::Color color)
{
_track_canvas_item->set_color (color);
}
void
EditorCursor::set_sensitive (bool yn)
{
_track_canvas_item->set_ignore_events (!yn);
}

1
gtk2_ardour/editor_cursors.h
View File

@ -37,6 +37,7 @@ class EditorCursor {
void show ();
void hide ();
void set_color (ArdourCanvas::Color);
void set_sensitive (bool);
framepos_t current_frame () const {
return _current_frame;

8
gtk2_ardour/rc_option_editor.cc
View File

@ -2140,6 +2140,14 @@ RCOptionEditor::RCOptionEditor ()
/* INTERFACE */
add_option (S_("Preferences|GUI"),
new BoolOption (
"draggable-playhead",
_("Allow dragging of playhead"),
sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_draggable_playhead),
sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_draggable_playhead)
));
add_option (S_("Preferences|GUI"),
new BoolOption (
"widget-prelight",

1
gtk2_ardour/ui_config_vars.h
View File

@ -26,4 +26,5 @@ UI_CONFIG_VARIABLE(bool, all_floating_windows_are_dialogs, "all-floating-windows
UI_CONFIG_VARIABLE (bool, color_regions_using_track_color, "color-regions-using-track-color", false)
UI_CONFIG_VARIABLE (bool, show_waveform_clipping, "show-waveform-clipping", true)
UI_CONFIG_VARIABLE (uint32_t, lock_gui_after_seconds, "lock-gui-after-seconds", 0)
UI_CONFIG_VARIABLE (bool, draggable_playhead, "draggable-playhead", true)