remove all trace of SAE from source code.

[ardour.git] / gtk2_ardour / audio_clock.cc

diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index df74ec789b5ccbce435eb7a3e2880b897bea8622..5a05b208940800f4d100d8630efdcafe5c432420 100644 (file)
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -151,7 +151,7 @@ AudioClock::on_realize ()
        Gtk::Requisition req;
 
        CairoWidget::on_realize ();
-       
+
        set_clock_dimensions (req);
 
        first_width = req.width;
@@ -318,7 +318,7 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
                cairo_save (cr);
                cairo_scale (cr, xscale, yscale);
        }
-       
+
        pango_cairo_show_layout (cr, _layout->gobj());
 
        if (xscale != 1.0 || yscale != 1.0) {
@@ -507,15 +507,15 @@ AudioClock::on_size_request (Gtk::Requisition* req)
                Glib::RefPtr<Gtk::Style> style = get_style ();
                Pango::FontDescription font;
                int w;
-               
+
                tmp = Pango::Layout::create (get_pango_context());
-               
+
                if (!is_realized()) {
                        font = get_font_for_style (get_name());
                } else {
                        font = style->get_font();
                }
-               
+
                tmp->set_font_description (font);
 
                font.set_size (INFO_FONT_SIZE);
@@ -561,17 +561,17 @@ AudioClock::start_edit (Field f)
                        edit_string.clear ();
                        _layout->set_text ("");
                }
-               
+
                input_string.clear ();
                editing = true;
                edit_is_negative = false;
-               
+
                if (f) {
                        input_string = get_field (f);
                        show_edit_status (merge_input_and_edit_string ());
                        _layout->set_text (edit_string);
                }
-               
+
                queue_draw ();
 
                Keyboard::magic_widget_grab_focus ();
@@ -1419,7 +1419,10 @@ AudioClock::on_key_press_event (GdkEventKey* ev)
                goto use_input_string;
 
        default:
-               return false;
+               /* do not allow other keys to passthru to the rest of the GUI
+                  when editing.
+               */
+               return true;
        }
 
        if (!insert_map.empty() && (input_string.length() >= insert_map.size())) {
@@ -2109,16 +2112,14 @@ AudioClock::build_ops_menu ()
        MenuList& ops_items = ops_menu->items();
        ops_menu->set_name ("ArdourContextMenu");
 
-       if (!Profile->get_sae()) {
-               ops_items.push_back (MenuElem (_("Timecode"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Timecode)));
-       }
+       ops_items.push_back (MenuElem (_("Timecode"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Timecode)));
        ops_items.push_back (MenuElem (_("Bars:Beats"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), BBT)));
        ops_items.push_back (MenuElem (_("Minutes:Seconds"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), MinSec)));
        ops_items.push_back (MenuElem (_("Samples"), sigc::bind (sigc::mem_fun(*this, &AudioClock::set_mode), Frames)));
 
        if (editable && !_off && !is_duration && !_follows_playhead) {
                ops_items.push_back (SeparatorElem());
-               ops_items.push_back (MenuElem (_("Set From Playhead"), sigc::mem_fun(*this, &AudioClock::set_from_playhead)));
+               ops_items.push_back (MenuElem (_("Set from Playhead"), sigc::mem_fun(*this, &AudioClock::set_from_playhead)));
                ops_items.push_back (MenuElem (_("Locate to This Time"), sigc::mem_fun(*this, &AudioClock::locate)));
        }
        ops_items.push_back (SeparatorElem());