Move a few declarations to first use.

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index cd3748517c5f93f865fcdbff07649168af3d59b9..ea8a34b6f4f9011af3fadf9ac61ad1d4067835ab 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -86,6 +86,7 @@
 #include "audio_time_axis.h"
 #include "automation_time_axis.h"
 #include "bundle_manager.h"
+#include "button_joiner.h"
 #include "canvas-noevent-text.h"
 #include "canvas_impl.h"
 #include "crossfade_edit.h"
@@ -150,6 +151,8 @@ static const gchar *_snap_type_strings[] = {
        N_("Timecode Minutes"),
        N_("Seconds"),
        N_("Minutes"),
+       N_("Beats/128"),
+       N_("Beats/64"),
        N_("Beats/32"),
        N_("Beats/28"),
        N_("Beats/24"),
@@ -646,6 +649,10 @@ Editor::Editor ()
        set_snap_mode (_snap_mode);
        set_mouse_mode (MouseObject, true);
         pre_internal_mouse_mode = MouseObject;
+        pre_internal_snap_type = _snap_type;
+        pre_internal_snap_mode = _snap_mode;
+        internal_snap_type = _snap_type;
+        internal_snap_mode = _snap_mode;
        set_edit_point_preference (EditAtMouse, true);
 
        _playlist_selector = new PlaylistSelector();
@@ -2063,6 +2070,8 @@ Editor::set_snap_to (SnapType st)
        instant_save ();
 
        switch (_snap_type) {
+       case SnapToBeatDiv128:
+       case SnapToBeatDiv64:
        case SnapToBeatDiv32:
        case SnapToBeatDiv28:
        case SnapToBeatDiv24:
@@ -2221,7 +2230,7 @@ Editor::set_state (const XMLNode& node, int /*version*/)
        }
 
        if ((prop = node.property ("zoom-focus"))) {
-               set_zoom_focus ((ZoomFocus) atoi (prop->value()));
+               set_zoom_focus ((ZoomFocus) string_2_enum (prop->value(), zoom_focus));
        }
 
        if ((prop = node.property ("zoom"))) {
@@ -2231,11 +2240,27 @@ Editor::set_state (const XMLNode& node, int /*version*/)
        }
 
        if ((prop = node.property ("snap-to"))) {
-               set_snap_to ((SnapType) atoi (prop->value()));
+               set_snap_to ((SnapType) string_2_enum (prop->value(), _snap_type));
        }
 
        if ((prop = node.property ("snap-mode"))) {
-               set_snap_mode ((SnapMode) atoi (prop->value()));
+               set_snap_mode ((SnapMode) string_2_enum (prop->value(), _snap_mode));
+       }
+
+       if ((prop = node.property ("internal-snap-to"))) {
+               internal_snap_type = (SnapType) string_2_enum (prop->value(), internal_snap_type);
+       }
+
+       if ((prop = node.property ("internal-snap-mode"))) {
+               internal_snap_mode = (SnapMode) string_2_enum (prop->value(), internal_snap_mode);
+       }
+
+       if ((prop = node.property ("pre-internal-snap-to"))) {
+               pre_internal_snap_type = (SnapType) string_2_enum (prop->value(), pre_internal_snap_type);
+       }
+
+       if ((prop = node.property ("pre-internal-snap-mode"))) {
+               pre_internal_snap_mode = (SnapMode) string_2_enum (prop->value(), pre_internal_snap_mode);
        }
 
        if ((prop = node.property ("mouse-mode"))) {
@@ -2419,15 +2444,15 @@ Editor::get_state ()
 
        maybe_add_mixer_strip_width (*node);
 
-       snprintf (buf, sizeof(buf), "%d", (int) zoom_focus);
-       node->add_property ("zoom-focus", buf);
+       node->add_property ("zoom-focus", enum_2_string (zoom_focus));
        snprintf (buf, sizeof(buf), "%f", frames_per_unit);
        node->add_property ("zoom", buf);
-       snprintf (buf, sizeof(buf), "%d", (int) _snap_type);
-       node->add_property ("snap-to", buf);
-       snprintf (buf, sizeof(buf), "%d", (int) _snap_mode);
-       node->add_property ("snap-mode", buf);
-
+       node->add_property ("snap-to", enum_2_string (_snap_type));
+       node->add_property ("snap-mode", enum_2_string (_snap_mode));
+       node->add_property ("internal-snap-to", enum_2_string (internal_snap_type));
+       node->add_property ("internal-snap-mode", enum_2_string (internal_snap_mode));
+       node->add_property ("pre-internal-snap-to", enum_2_string (pre_internal_snap_type));
+       node->add_property ("pre-internal-snap-mode", enum_2_string (pre_internal_snap_mode));
        node->add_property ("edit-point", enum_2_string (_edit_point));
 
        snprintf (buf, sizeof (buf), "%" PRIi64, playhead_cursor->current_frame);
@@ -2634,6 +2659,12 @@ Editor::snap_to_internal (framepos_t& start, int32_t direction, bool for_mark)
                start = _session->tempo_map().round_to_beat (start, direction);
                break;
 
+       case SnapToBeatDiv128:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 128, direction);
+               break;
+       case SnapToBeatDiv64:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 64, direction);
+               break;
        case SnapToBeatDiv32:
                start = _session->tempo_map().round_to_beat_subdivision (start, 32, direction);
                break;
@@ -2787,9 +2818,12 @@ Editor::setup_toolbar ()
        /* make them just a bit bigger */
        mouse_move_button.set_size_request (-1, 25);
 
-       smart_mode_joiner = manage (new ButtonJoiner (mouse_move_button, mouse_select_button));
+       smart_mode_joiner = manage (new ButtonJoiner ("mouse mode button", mouse_move_button, mouse_select_button));
        smart_mode_joiner->set_related_action (smart_mode_action);
 
+       mouse_move_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
+       mouse_select_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
+
        mouse_move_button.set_rounded_corner_mask (0x1); // upper left only 
        mouse_select_button.set_rounded_corner_mask (0x2); // upper right only 
 
@@ -3016,6 +3050,7 @@ Editor::setup_tooltips ()
        ARDOUR_UI::instance()->set_tip (snap_mode_selector, _("Snap/Grid Mode"));
        ARDOUR_UI::instance()->set_tip (edit_point_selector, _("Edit point"));
        ARDOUR_UI::instance()->set_tip (edit_mode_selector, _("Edit Mode"));
+       ARDOUR_UI::instance()->set_tip (nudge_clock, _("Nudge Clock\n(controls distance used to nudge regions and selections)"));
 }
 
 int
@@ -3346,6 +3381,10 @@ Editor::snap_type_selection_done ()
                snaptype = SnapToBeatDiv28;
        } else if (choice == _("Beats/32")) {
                snaptype = SnapToBeatDiv32;
+       } else if (choice == _("Beats/64")) {
+               snaptype = SnapToBeatDiv64;
+       } else if (choice == _("Beats/128")) {
+               snaptype = SnapToBeatDiv128;
        } else if (choice == _("Beats")) {
                snaptype = SnapToBeat;
        } else if (choice == _("Bars")) {
@@ -3753,6 +3792,12 @@ Editor::get_grid_type_as_beats (bool& success, framepos_t position)
                return 1.0;
                break;
 
+       case SnapToBeatDiv128:
+               return 1.0/128.0;
+               break;
+       case SnapToBeatDiv64:
+               return 1.0/64.0;
+               break;
        case SnapToBeatDiv32:
                return 1.0/32.0;
                break;