Add a PianoKeyboard to GenericUI (on a MIDI track)

[ardour.git] / gtk2_ardour / main_clock.cc

diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc
index f90599de1374e6675a636e0188305e2ccefc4850..6a759eb9dce18a69df93574682ae5b2518156a96 100644 (file)
--- a/gtk2_ardour/main_clock.cc
+++ b/gtk2_ardour/main_clock.cc
@@ -17,13 +17,14 @@
 
 */
 
-#include "ardour_ui.h"
+#include "ardour/tempo.h"
+
+#include "actions.h"
 #include "main_clock.h"
+#include "ui_config.h"
 #include "public_editor.h"
 
-#include "i18n.h"
-
-#include "ardour/tempo.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 
@@ -35,7 +36,14 @@ MainClock::MainClock (
        : AudioClock (clock_name, false, widget_name, true, true, false, true)
          , _primary (primary)
 {
+}
 
+void
+MainClock::set_session (ARDOUR::Session *s)
+{
+       AudioClock::set_session (s);
+       _left_btn.set_related_action (ActionManager::get_action (X_("Editor"), X_("edit-current-tempo")));
+       _right_btn.set_related_action (ActionManager::get_action (X_("Editor"), X_("edit-current-meter")));
 }
 
 void
@@ -50,13 +58,13 @@ MainClock::build_ops_menu ()
        ops_items.push_back (CheckMenuElem (_("Display delta to edit cursor"), sigc::mem_fun (*this, &MainClock::display_delta_to_edit_cursor)));
        Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem *> (&ops_items.back());
        if (_primary) {
-               if (ARDOUR_UI::config()->get_primary_clock_delta_edit_cursor ()) {
-                       ARDOUR_UI::config()->set_primary_clock_delta_edit_cursor (false);
+               if (UIConfiguration::instance().get_primary_clock_delta_edit_cursor ()) {
+                       UIConfiguration::instance().set_primary_clock_delta_edit_cursor (false);
                        c->set_active (true);
                }
        } else {
-               if (ARDOUR_UI::config()->get_secondary_clock_delta_edit_cursor ()) {
-                       ARDOUR_UI::config()->set_secondary_clock_delta_edit_cursor (false);
+               if (UIConfiguration::instance().get_secondary_clock_delta_edit_cursor ()) {
+                       UIConfiguration::instance().set_secondary_clock_delta_edit_cursor (false);
                        c->set_active (true);
                }
        }
@@ -73,7 +81,7 @@ MainClock::absolute_time () const
 {
        if (get_is_duration ()) {
                // delta to edit cursor
-               return current_time () + PublicEditor::instance().get_preferred_edit_position (true);
+               return current_time () + PublicEditor::instance().get_preferred_edit_position (Editing::EDIT_IGNORE_PHEAD);
        } else {
                return current_time ();
        }
@@ -83,25 +91,26 @@ void
 MainClock::display_delta_to_edit_cursor ()
 {
        if (_primary) {
-               ARDOUR_UI::config()->set_primary_clock_delta_edit_cursor (!ARDOUR_UI::config()->get_primary_clock_delta_edit_cursor ());
+               UIConfiguration::instance().set_primary_clock_delta_edit_cursor (!UIConfiguration::instance().get_primary_clock_delta_edit_cursor ());
        } else {
-               ARDOUR_UI::config()->set_secondary_clock_delta_edit_cursor (!ARDOUR_UI::config()->get_secondary_clock_delta_edit_cursor ());
+               UIConfiguration::instance().set_secondary_clock_delta_edit_cursor (!UIConfiguration::instance().get_secondary_clock_delta_edit_cursor ());
        }
 }
 
 void
 MainClock::edit_current_tempo ()
 {
-       ARDOUR::TempoSection ts = PublicEditor::instance().session()->tempo_map().tempo_section_at (absolute_time());
-       PublicEditor::instance().edit_tempo_section (&ts);
+       if (!PublicEditor::instance().session()) return;
+       ARDOUR::TempoSection* ts = const_cast<ARDOUR::TempoSection*>(&PublicEditor::instance().session()->tempo_map().tempo_section_at_frame (absolute_time()));
+       PublicEditor::instance().edit_tempo_section (ts);
 }
 
 void
 MainClock::edit_current_meter ()
 {
-       ARDOUR::Meter m = PublicEditor::instance().session()->tempo_map().meter_at (absolute_time());
-       ARDOUR::MeterSection ms (absolute_time(), m.divisions_per_bar(), m.note_divisor());
-       PublicEditor::instance().edit_meter_section (&ms);
+       if (!PublicEditor::instance().session()) return;
+       ARDOUR::MeterSection* ms = const_cast<ARDOUR::MeterSection*>(&PublicEditor::instance().session()->tempo_map().meter_section_at_frame (absolute_time()));
+       PublicEditor::instance().edit_meter_section (ms);
 }
 
 void
@@ -115,25 +124,3 @@ MainClock::insert_new_meter ()
 {
        PublicEditor::instance().mouse_add_new_meter_event (absolute_time ());
 }
-
-bool
-MainClock::on_button_press_event (GdkEventButton *ev)
-{
-       if (ev->button == 1) {
-               if (mode() == BBT) {
-                       if (is_lower_layout_click(ev->y)) {
-                               if (is_right_layout_click(ev->x)) {
-                                       // meter on the right
-                                       edit_current_meter();
-                               } else {
-                                       // tempo on the left
-                                       edit_current_tempo();
-                               }
-                               return true;
-                       }
-               }
-       }
-
-       return AudioClock::on_button_press_event (ev);
-}
-