diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-08 18:02:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-08 18:02:03 +0000 |
| commit | d7faaf7b028d7e0a56b8cefb90210f7e7505e6f0 (patch) | |
| tree | 434de179ca3cd0f481392f1120fccbf208ff91a3 /gtk2_ardour | |
| parent | ff122d0fe8fde6a8a4edc71f9dbba5d161036300 (diff) | |
fix 2 action group registrations, and reorder initialization
git-svn-id: svn://localhost/ardour2/branches/3.0@6037 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index eef1c6c3a7..3da5104f8b 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -267,14 +267,13 @@ ARDOUR_UI::install_actions () - otherwise do nothing */ - ActionManager::register_action (transport_actions, X_("TransitionToRoll"), _("Transition To Roll"), bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), true)); - ActionManager::session_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("TransitionToRoll"), _("Transition To Roll"), bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), true)); ActionManager::session_sensitive_actions.push_back (act); + ActionManager::transport_sensitive_actions.push_back (act); - ActionManager::register_action (transport_actions, X_("TransitionToReverse"), _("Transition To Reverse"), bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), false)); - ActionManager::session_sensitive_actions.push_back (act); + act = ActionManager::register_action (transport_actions, X_("TransitionToReverse"), _("Transition To Reverse"), bind (mem_fun (*editor, &PublicEditor::transition_to_rolling), false)); ActionManager::session_sensitive_actions.push_back (act); - + ActionManager::transport_sensitive_actions.push_back (act); act = ActionManager::register_action (transport_actions, X_("Loop"), _("Play Loop Range"), mem_fun(*this, &ARDOUR_UI::toggle_session_auto_loop)); ActionManager::session_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index df12ddf94c..62810615d4 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -57,8 +57,8 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i) , _grab_frame (0) , _last_pointer_frame (0) , _current_pointer_frame (0) - , _had_movement (false) , _have_transaction (false) + , _had_movement (false) , _move_threshold_passed (false) { |