remove all trace of SAE from source code.

[ardour.git] / gtk2_ardour / editor_rulers.cc

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index f4ce487654f6017521440939bfa68d396368e520..3b992535d1d90fc0c607930cbaa28a7b9e952f85 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -130,7 +130,7 @@ Editor::initialize_rulers ()
        _bbt_metric = new BBTMetric (this);
        _minsec_metric = new MinsecMetric (this);
        _samples_metric = new SamplesMetric (this);
-       
+
        timecode_ruler = new ArdourCanvas::Ruler (_time_markers_group, *_timecode_metric,
                                                  ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, timebar_height));
        timecode_ruler->set_font_description (font);
@@ -175,7 +175,7 @@ Editor::initialize_rulers ()
        minsec_ruler->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_event), minsec_ruler, MinsecRulerItem));
        bbt_ruler->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_event), bbt_ruler, BBTRulerItem));
        samples_ruler->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_event), samples_ruler, SamplesRulerItem));
-       
+
        visible_timebars = 0; /*this will be changed below */
 }
 
@@ -212,15 +212,14 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
                ruler_items.push_back (MenuElem (_("New location marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, false)));
                ruler_items.push_back (MenuElem (_("Clear all locations"), sigc::mem_fun(*this, &Editor::clear_markers)));
                ruler_items.push_back (MenuElem (_("Unhide locations"), sigc::mem_fun(*this, &Editor::unhide_markers)));
-               ruler_items.push_back (SeparatorElem ());
                break;
+
        case RangeMarkerBarItem:
                ruler_items.push_back (MenuElem (_("New range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_range), where)));
                ruler_items.push_back (MenuElem (_("Clear all ranges"), sigc::mem_fun(*this, &Editor::clear_ranges)));
                ruler_items.push_back (MenuElem (_("Unhide ranges"), sigc::mem_fun(*this, &Editor::unhide_ranges)));
-               ruler_items.push_back (SeparatorElem ());
-
                break;
+
        case TransportMarkerBarItem:
                ruler_items.push_back (MenuElem (_("New Loop range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_loop), where)));
                ruler_items.push_back (MenuElem (_("New Punch range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_punch), where)));
@@ -231,7 +230,6 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t)
                ruler_items.push_back (MenuElem (_("New CD track marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, true)));
                break;
 
-
        case TempoBarItem:
                ruler_items.push_back (MenuElem (_("New Tempo"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_tempo_event), where)));
                break;
@@ -542,7 +540,7 @@ Editor::update_ruler_visibility ()
                tempo_label.hide();
        }
 
-       if (!Profile->get_sae() && ruler_range_action->get_active()) {
+       if (ruler_range_action->get_active()) {
                old_unit_pos = range_marker_group->position().y;
                if (tbpos != old_unit_pos) {
                        range_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
@@ -1141,7 +1139,7 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper,
        } else {
                bbt_ruler_scale =  bbt_show_ticks_detail;
        }
-       
+
        if ((bbt_ruler_scale == bbt_show_ticks_detail) && (lower_beat.beats == upper_beat.beats) && (upper_beat.ticks - lower_beat.ticks <= Timecode::BBT_Time::ticks_per_beat / 4)) {
                bbt_ruler_scale =  bbt_show_ticks_super_detail;
        }
@@ -1154,7 +1152,7 @@ edit_last_mark_label (std::vector<ArdourCanvas::Ruler::Mark>& marks, const std::
        copy.label = newlabel;
        marks.pop_back ();
        marks.push_back (copy);
-}              
+}
 
 void
 Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble lower, gdouble upper, gint /*maxchars*/)
@@ -1234,7 +1232,7 @@ Editor::metric_get_bbt (std::vector<ArdourCanvas::Ruler::Mark>& marks, gdouble l
                bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
 
                bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
-               
+
                // could do marks.assign() here to preallocate
 
                mark.label = "";