X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain_clock.cc;h=94f7bab696b85e1314d101f2b39aecfda42f8d67;hb=9b2612f68615d1b3f80fce732e4a13f5e50ee87d;hp=8bb685da4b807d1f0cdcb1fdba6ef71f732147e4;hpb=ecd265222a6fe7a1d2dba1aa706a1ea95abeff87;p=ardour.git

diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc
index 8bb685da4b..94f7bab696 100644
--- a/gtk2_ardour/main_clock.cc
+++ b/gtk2_ardour/main_clock.cc
@@ -17,30 +17,36 @@
 
 */
 
-#include "ardour_ui.h"
+#include "pbd/unwind.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;
+using namespace ARDOUR;
 
 MainClock::MainClock (
 	const std::string& clock_name,
-	bool is_transient,
 	const std::string& widget_name,
-	bool editable,
-	bool follows_playhead,
-	bool primary,
-	bool duration,
-	bool with_info
+	bool primary
 	)
-	: AudioClock (clock_name, is_transient, widget_name, editable, follows_playhead, duration, with_info)
-	  , _primary (primary)
+	: AudioClock (clock_name, false, widget_name, true, true, false, true)
+	, _primary (primary)
+	, _suspend_delta_mode_signal (false)
 {
+}
 
+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
@@ -52,61 +58,105 @@ MainClock::build_ops_menu ()
 
 	MenuList& ops_items = ops_menu->items();
 	ops_items.push_back (SeparatorElem ());
-	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());
+	RadioMenuItem::Group group;
+	PBD::Unwinder<bool> uw (_suspend_delta_mode_signal, true);
+	ClockDeltaMode mode;
 	if (_primary) {
-		if (ARDOUR_UI::config()->get_primary_clock_delta_edit_cursor ()) {
-			ARDOUR_UI::config()->set_primary_clock_delta_edit_cursor (false);
-			c->set_active (true);
-		}
+		mode = UIConfiguration::instance().get_primary_clock_delta_mode ();
 	} else {
-		if (ARDOUR_UI::config()->get_secondary_clock_delta_edit_cursor ()) {
-			ARDOUR_UI::config()->set_secondary_clock_delta_edit_cursor (false);
-			c->set_active (true);
-		}
+		mode = UIConfiguration::instance().get_secondary_clock_delta_mode ();
+	}
+
+	ops_items.push_back (RadioMenuElem (group, _("Display absolute time"), sigc::bind (sigc::mem_fun (*this, &MainClock::set_display_delta_mode), NoDelta)));
+	if (mode == NoDelta) {
+		RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&ops_items.back ());
+		i->set_active (true);
+	}
+	ops_items.push_back (RadioMenuElem (group, _("Display delta to edit cursor"), sigc::bind (sigc::mem_fun (*this, &MainClock::set_display_delta_mode), DeltaEditPoint)));
+	if (mode == DeltaEditPoint) {
+		RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&ops_items.back ());
+		i->set_active (true);
+	}
+	ops_items.push_back (RadioMenuElem (group, _("Display delta to origin marker"), sigc::bind (sigc::mem_fun (*this, &MainClock::set_display_delta_mode), DeltaOriginMarker)));
+	if (mode == DeltaOriginMarker) {
+		RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&ops_items.back ());
+		i->set_active (true);
 	}
 
 	ops_items.push_back (SeparatorElem());
+
 	ops_items.push_back (MenuElem (_("Edit Tempo"), sigc::mem_fun(*this, &MainClock::edit_current_tempo)));
 	ops_items.push_back (MenuElem (_("Edit Meter"), sigc::mem_fun(*this, &MainClock::edit_current_meter)));
 	ops_items.push_back (MenuElem (_("Insert Tempo Change"), sigc::mem_fun(*this, &MainClock::insert_new_tempo)));
 	ops_items.push_back (MenuElem (_("Insert Meter Change"), sigc::mem_fun(*this, &MainClock::insert_new_meter)));
 }
 
-framepos_t
+samplepos_t
 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 () + offset ();
 	} else {
 		return current_time ();
 	}
 }
 
 void
-MainClock::display_delta_to_edit_cursor ()
+MainClock::set (samplepos_t when, bool force, ARDOUR::samplecnt_t /*offset*/)
 {
+	ClockDeltaMode mode;
 	if (_primary) {
-		ARDOUR_UI::config()->set_primary_clock_delta_edit_cursor (!ARDOUR_UI::config()->get_primary_clock_delta_edit_cursor ());
+		mode = UIConfiguration::instance().get_primary_clock_delta_mode ();
 	} else {
-		ARDOUR_UI::config()->set_secondary_clock_delta_edit_cursor (!ARDOUR_UI::config()->get_secondary_clock_delta_edit_cursor ());
+		mode = UIConfiguration::instance().get_secondary_clock_delta_mode ();
+	}
+	if (!PublicEditor::instance().session()) {
+		mode = NoDelta;
+	}
+
+	switch (mode) {
+		case NoDelta:
+			AudioClock::set (when, force, 0);
+			break;
+		case DeltaEditPoint:
+			AudioClock::set (when, force, PublicEditor::instance().get_preferred_edit_position (Editing::EDIT_IGNORE_PHEAD));
+			break;
+		case DeltaOriginMarker:
+			{
+				Location* loc = PublicEditor::instance().session()->locations()->clock_origin_location ();
+				AudioClock::set (when, force, loc ? loc->start() : 0);
+			}
+			break;
+	}
+}
+
+void
+MainClock::set_display_delta_mode (ClockDeltaMode m)
+{
+	if (_suspend_delta_mode_signal) {
+		return;
+	}
+	if (_primary) {
+		UIConfiguration::instance().set_primary_clock_delta_mode (m);
+	} else {
+		UIConfiguration::instance().set_secondary_clock_delta_mode (m);
 	}
 }
 
 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_sample (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_sample (absolute_time()));
+	PublicEditor::instance().edit_meter_section (ms);
 }
 
 void
@@ -120,4 +170,3 @@ MainClock::insert_new_meter ()
 {
 	PublicEditor::instance().mouse_add_new_meter_event (absolute_time ());
 }
-