projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
final use of "stop_signal.h" removed
[ardour.git] / gtk2_ardour / editor.cc
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index d6d1f7bef4ac0098c15b545127b261c878a6d660..62edad9991165d038ea656418e608ba7406fd64e 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -145,10 +145,19 @@ static const gchar *_snap_type_strings[] = {
        N_("Seconds"),
        N_("Minutes"),
        N_("Beats/32"),
+       N_("Beats/28"),
+       N_("Beats/24"),
        N_("Beats/16"),
+       N_("Beats/14"),
+       N_("Beats/12"),
+       N_("Beats/10"),
        N_("Beats/8"),
+       N_("Beats/7"),
+       N_("Beats/6"),
+       N_("Beats/5"),
        N_("Beats/4"),
        N_("Beats/3"),
+       N_("Beats/2"),
        N_("Beats"),
        N_("Bars"),
        N_("Marks"),
@@ -1661,11 +1670,10 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
                        sigc::bind (sigc::mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr<Region>(region)));
 
                items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::rename_region)));
-               if (mr && internal_editing()) {
-                       items.push_back (MenuElem (_("List editor..."), sigc::mem_fun(*this, &Editor::show_midi_list_editor)));
-               } else {
-                       items.push_back (MenuElem (_("Region Properties..."), sigc::mem_fun(*this, &Editor::edit_region)));
+               if (mr) {
+                       items.push_back (MenuElem (_("List Editor..."), sigc::mem_fun(*this, &Editor::show_midi_list_editor)));
                }
+               items.push_back (MenuElem (_("Region Properties..."), sigc::mem_fun(*this, &Editor::edit_region)));
        }
 
        items.push_back (MenuElem (_("Raise to Top Layer"), sigc::mem_fun(*this, &Editor::raise_region_to_top)));
@@ -1784,6 +1792,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
 
        } else if (mr) {
                items.push_back (MenuElem (_("Quantize"), sigc::mem_fun(*this, &Editor::quantize_region)));
+               items.push_back (MenuElem (_("Fork"), sigc::mem_fun(*this, &Editor::fork_region)));
                items.push_back (SeparatorElem());
        }
 
@@ -1916,7 +1925,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
        edit_items.push_back (MenuElem (_("Consolidate Range With Processing"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), true, true)));
        edit_items.push_back (MenuElem (_("Bounce Range to Region List"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), false, false)));
        edit_items.push_back (MenuElem (_("Bounce Range to Region List With Processing"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), false, true)));
-       edit_items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_range)));
+       edit_items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_selection)));
 }
 
 
@@ -2090,11 +2099,20 @@ Editor::set_snap_to (SnapType st)
        instant_save ();
 
        switch (_snap_type) {
-       case SnapToAThirtysecondBeat:
-       case SnapToASixteenthBeat:
-       case SnapToAEighthBeat:
-       case SnapToAQuarterBeat:
-       case SnapToAThirdBeat:
+       case SnapToBeatDiv32:
+       case SnapToBeatDiv28:
+       case SnapToBeatDiv24:
+       case SnapToBeatDiv16:
+       case SnapToBeatDiv14:
+       case SnapToBeatDiv12:
+       case SnapToBeatDiv10:
+       case SnapToBeatDiv8:
+       case SnapToBeatDiv7:
+       case SnapToBeatDiv6:
+       case SnapToBeatDiv5:
+       case SnapToBeatDiv4:
+       case SnapToBeatDiv3:
+       case SnapToBeatDiv2:
                compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
                update_tempo_based_rulers ();
                break;
@@ -2109,7 +2127,9 @@ Editor::set_snap_to (SnapType st)
        default:
                /* relax */
                break;
-    }
+       }
+
+       SnapChanged (); /* EMIT SIGNAL */
 }
 
 void
@@ -2642,25 +2662,48 @@ Editor::snap_to_internal (nframes64_t& start, int32_t direction, bool for_mark)
                start = _session->tempo_map().round_to_beat (start, direction);
                break;
 
-       case SnapToAThirtysecondBeat:
+       case SnapToBeatDiv32:
                start = _session->tempo_map().round_to_beat_subdivision (start, 32, direction);
                break;
-
-       case SnapToASixteenthBeat:
+       case SnapToBeatDiv28:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 28, direction);
+               break;
+       case SnapToBeatDiv24:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 24, direction);
+               break;
+       case SnapToBeatDiv16:
                start = _session->tempo_map().round_to_beat_subdivision (start, 16, direction);
                break;
-
-       case SnapToAEighthBeat:
+       case SnapToBeatDiv14:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 14, direction);
+               break;
+       case SnapToBeatDiv12:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 12, direction);
+               break;
+       case SnapToBeatDiv10:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 10, direction);
+               break;
+       case SnapToBeatDiv8:
                start = _session->tempo_map().round_to_beat_subdivision (start, 8, direction);
                break;
-
-       case SnapToAQuarterBeat:
+       case SnapToBeatDiv7:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 7, direction);
+               break;
+       case SnapToBeatDiv6:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 6, direction);
+               break;
+       case SnapToBeatDiv5:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 5, direction);
+               break;
+       case SnapToBeatDiv4:
                start = _session->tempo_map().round_to_beat_subdivision (start, 4, direction);
                break;
-
-       case SnapToAThirdBeat:
+       case SnapToBeatDiv3:
                start = _session->tempo_map().round_to_beat_subdivision (start, 3, direction);
                break;
+       case SnapToBeatDiv2:
+               start = _session->tempo_map().round_to_beat_subdivision (start, 2, direction);
+               break;
 
        case SnapToMark:
                if (for_mark) {
@@ -2967,7 +3010,6 @@ void
 Editor::setup_tooltips ()
 {
        ARDOUR_UI::instance()->set_tip (mouse_move_button, _("Select/Move Objects"));
-       ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges"));
        ARDOUR_UI::instance()->set_tip (mouse_gain_button, _("Draw Gain Automation"));
        ARDOUR_UI::instance()->set_tip (mouse_zoom_button, _("Select Zoom Range"));
        ARDOUR_UI::instance()->set_tip (mouse_timefx_button, _("Stretch/Shrink Regions"));
@@ -3419,16 +3461,34 @@ Editor::snap_type_selection_done ()
        string choice = snap_type_selector.get_active_text();
        SnapType snaptype = SnapToBeat;
 
-       if (choice == _("Beats/3")) {
-               snaptype = SnapToAThirdBeat;
+       if (choice == _("Beats/2")) {
+               snaptype = SnapToBeatDiv2;
+       } else if (choice == _("Beats/3")) {
+               snaptype = SnapToBeatDiv3;
        } else if (choice == _("Beats/4")) {
-               snaptype = SnapToAQuarterBeat;
+               snaptype = SnapToBeatDiv4;
+       } else if (choice == _("Beats/5")) {
+               snaptype = SnapToBeatDiv5;
+       } else if (choice == _("Beats/6")) {
+               snaptype = SnapToBeatDiv6;
+       } else if (choice == _("Beats/7")) {
+               snaptype = SnapToBeatDiv7;
        } else if (choice == _("Beats/8")) {
-               snaptype = SnapToAEighthBeat;
+               snaptype = SnapToBeatDiv8;
+       } else if (choice == _("Beats/10")) {
+               snaptype = SnapToBeatDiv10;
+       } else if (choice == _("Beats/12")) {
+               snaptype = SnapToBeatDiv12;
+       } else if (choice == _("Beats/14")) {
+               snaptype = SnapToBeatDiv14;
        } else if (choice == _("Beats/16")) {
-               snaptype = SnapToASixteenthBeat;
+               snaptype = SnapToBeatDiv16;
+       } else if (choice == _("Beats/24")) {
+               snaptype = SnapToBeatDiv24;
+       } else if (choice == _("Beats/28")) {
+               snaptype = SnapToBeatDiv28;
        } else if (choice == _("Beats/32")) {
-               snaptype = SnapToAThirtysecondBeat;
+               snaptype = SnapToBeatDiv32;
        } else if (choice == _("Beats")) {
                snaptype = SnapToBeat;
        } else if (choice == _("Bars")) {
@@ -3789,25 +3849,48 @@ Editor::get_grid_type_as_beats (bool& success, nframes64_t position)
                return 1.0;
                break;
 
-       case SnapToAThirtysecondBeat:
+       case SnapToBeatDiv32:
                return 1.0/32.0;
                break;
-
-       case SnapToASixteenthBeat:
+       case SnapToBeatDiv28:
+               return 1.0/28.0;
+               break;
+       case SnapToBeatDiv24:
+               return 1.0/24.0;
+               break;
+       case SnapToBeatDiv16:
                return 1.0/16.0;
                break;
-
-       case SnapToAEighthBeat:
+       case SnapToBeatDiv14:
+               return 1.0/14.0;
+               break;
+       case SnapToBeatDiv12:
+               return 1.0/12.0;
+               break;
+       case SnapToBeatDiv10:
+               return 1.0/10.0;
+               break;
+       case SnapToBeatDiv8:
                return 1.0/8.0;
                break;
-
-       case SnapToAQuarterBeat:
+       case SnapToBeatDiv7:
+               return 1.0/7.0;
+               break;
+       case SnapToBeatDiv6:
+               return 1.0/6.0;
+               break;
+       case SnapToBeatDiv5:
+               return 1.0/5.0;
+               break;
+       case SnapToBeatDiv4:
                return 1.0/4.0;
                break;
-
-       case SnapToAThirdBeat:
+       case SnapToBeatDiv3:
                return 1.0/3.0;
                break;
+       case SnapToBeatDiv2:
+               return 1.0/2.0;
+               break;
 
        case SnapToBar:
                if (_session) {
@@ -4698,8 +4781,8 @@ Editor::add_to_idle_resize (TimeAxisView* view, int32_t h)
        }
 
        /* clamp */
-       if (uint32_t (min_resulting) < TimeAxisView::hSmall) {
-               _pending_resize_amount += TimeAxisView::hSmall - min_resulting;
+       if (uint32_t (min_resulting) < TimeAxisView::preset_height (HeightSmall)) {
+               _pending_resize_amount += TimeAxisView::preset_height (HeightSmall) - min_resulting;
        }
 }
 
Unnamed repository; edit this file 'description' to name the repository.