X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=abe6d8a6588e83e7077de610408d48ddad4b015d;hb=dfef8b7f6257364053e13ab4d5e317b703abd0af;hp=86318b52548c4113e84adacdc95ddf73b9446df5;hpb=b3722f7063699fafd0421d504e05a7300c70e0ec;p=ardour.git

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 86318b5254..abe6d8a658 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -31,13 +31,14 @@
 #include "canvas/item.h"
 #include "canvas/rectangle.h"
 
+#include "widgets/prompter.h"
+
 #include "editor.h"
 #include "marker.h"
 #include "selection.h"
 #include "editing.h"
 #include "gui_thread.h"
 #include "actions.h"
-#include "prompter.h"
 #include "editor_drag.h"
 
 #include "pbd/i18n.h"
@@ -164,6 +165,7 @@ Editor::add_new_location_internal (Location* location)
 	}
 
 	location->name_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+	location->position_lock_style_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
 	location->FlagsChanged.connect (*this, invalidator (*this), boost::bind (&Editor::location_flags_changed, this, location), gui_context());
 
 	pair<Location*,LocationMarkers*> newpair;
@@ -204,7 +206,12 @@ Editor::location_changed (Location *location)
 		return;
 	}
 
-	lam->set_name (location->name ());
+	if (location->position_lock_style() == MusicTime) {
+		lam->set_name ("\u266B" + location->name ()); // BEAMED EIGHTH NOTES
+	} else {
+		lam->set_name (location->name ());
+	}
+
 	lam->set_position (location->start(), location->end());
 
 	if (location->is_auto_loop()) {
@@ -590,8 +597,8 @@ Editor::LocationMarkers::set_name (const string& str)
 }
 
 void
-Editor::LocationMarkers::set_position (framepos_t startf,
-				       framepos_t endf)
+Editor::LocationMarkers::set_position (samplepos_t startf,
+				       samplepos_t endf)
 {
 	start->set_position (startf);
 	if (end) {
@@ -636,7 +643,7 @@ Editor::LocationMarkers::setup_lines ()
 }
 
 void
-Editor::mouse_add_new_marker (framepos_t where, bool is_cd)
+Editor::mouse_add_new_marker (samplepos_t where, bool is_cd)
 {
 	string markername;
 	int flags = (is_cd ? Location::IsCDMarker|Location::IsMark : Location::IsMark);
@@ -667,7 +674,7 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd)
 }
 
 void
-Editor::mouse_add_new_loop (framepos_t where)
+Editor::mouse_add_new_loop (samplepos_t where)
 {
 	if (!_session) {
 		return;
@@ -677,13 +684,13 @@ Editor::mouse_add_new_loop (framepos_t where)
 	   it's reasonably easy to manipulate after creation.
 	*/
 
-	framepos_t const end = where + current_page_samples() / 8;
+	samplepos_t const end = where + current_page_samples() / 8;
 
 	set_loop_range (where, end,  _("set loop range"));
 }
 
 void
-Editor::mouse_add_new_punch (framepos_t where)
+Editor::mouse_add_new_punch (samplepos_t where)
 {
 	if (!_session) {
 		return;
@@ -693,13 +700,13 @@ Editor::mouse_add_new_punch (framepos_t where)
 	   it's reasonably easy to manipulate after creation.
 	*/
 
-	framepos_t const end = where + current_page_samples() / 8;
+	samplepos_t const end = where + current_page_samples() / 8;
 
 	set_punch_range (where, end,  _("set punch range"));
 }
 
 void
-Editor::mouse_add_new_range (framepos_t where)
+Editor::mouse_add_new_range (samplepos_t where)
 {
 	if (!_session) {
 		return;
@@ -709,7 +716,7 @@ Editor::mouse_add_new_range (framepos_t where)
 	   it's reasonably easy to manipulate after creation.
 	*/
 
-	framepos_t const end = where + current_page_samples() / 8;
+	samplepos_t const end = where + current_page_samples() / 8;
 
 	string name;
 	_session->locations()->next_available_name (name, _("range"));
@@ -741,7 +748,7 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
 	Location* loc = find_location_from_marker (marker, is_start);
 
 	if (_session && loc) {
-	  	Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc));
+		Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc));
 	}
 }
 
@@ -810,7 +817,7 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It
 		can_remove = !mm->meter().initial ();
 		delete meter_marker_menu;
 		build_meter_marker_menu (mm, can_remove);
-		meter_marker_menu->popup (ev->button, ev->time);
+		meter_marker_menu->popup (1, ev->time);
 	} else if (tm) {
 		if (!tm->tempo().active()) {
 			return;
@@ -818,7 +825,7 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It
 		can_remove = !tm->tempo().initial() && !tm->tempo().locked_to_meter();
 		delete tempo_marker_menu;
 		build_tempo_marker_menu (tm, can_remove);
-		tempo_marker_menu->popup (ev->button, ev->time);
+		tempo_marker_menu->popup (1, ev->time);
 	} else {
 		return;
 	}
@@ -842,7 +849,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 		build_range_marker_menu (loc, loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());
 
 		marker_menu_item = item;
-		transport_marker_menu->popup (ev->button, ev->time);
+		transport_marker_menu->popup (1, ev->time);
 
 	} else if (loc->is_mark()) {
 
@@ -864,14 +871,14 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 			}
 #endif
 			marker_menu_item = item;
-			marker_menu->popup (ev->button, ev->time);
+			marker_menu->popup (1, ev->time);
 
 	} else if (loc->is_range_marker()) {
 		delete range_marker_menu;
 		build_range_marker_menu (loc, false, false);
 
 		marker_menu_item = item;
-		range_marker_menu->popup (ev->button, ev->time);
+		range_marker_menu->popup (1, ev->time);
 	}
 }
 
@@ -882,7 +889,7 @@ Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Ite
 		build_new_transport_marker_menu ();
 	}
 
-	new_transport_marker_menu->popup (ev->button, ev->time);
+	new_transport_marker_menu->popup (1, ev->time);
 
 }
 
@@ -904,6 +911,7 @@ Editor::build_marker_menu (Location* loc)
 
 	items.push_back (MenuElem (_("Create Range to Next Marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next)));
 
+	items.push_back (MenuElem (_("Promote to Time Origin"), sigc::mem_fun(*this, &Editor::marker_menu_set_origin)));
 	items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
 	items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
 
@@ -963,6 +971,7 @@ Editor::build_range_marker_menu (Location* loc, bool loop_or_punch, bool session
 	items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_range)));
 	items.push_back (SeparatorElem());
 
+	items.push_back (MenuElem (_("Promote to Time Origin"), sigc::mem_fun(*this, &Editor::marker_menu_set_origin)));
 	if (!loop_or_punch_or_session) {
 		items.push_back (MenuElem (_("Hide Range"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
 		items.push_back (MenuElem (_("Rename Range..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
@@ -993,15 +1002,14 @@ Editor::build_tempo_marker_menu (TempoMarker* loc, bool can_remove)
 
 	if (!loc->tempo().initial()) {
 		if (loc->tempo().clamped()) {
-			items.push_back (MenuElem (_("Unlock Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
+			items.push_back (MenuElem (_("Don't Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
 		} else {
-			items.push_back (MenuElem (_("Lock Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
+			items.push_back (MenuElem (_("Continue"), sigc::mem_fun(*this, &Editor::toggle_tempo_clamped)));
 		}
+	}
 
-		TempoSection* prev_ts = _session->tempo_map().previous_tempo_section (&loc->tempo());
-		if (prev_ts && prev_ts->end_note_types_per_minute() != loc->tempo().note_types_per_minute()) {
-			items.push_back (MenuElem (_("Continue"), sigc::mem_fun(*this, &Editor::continue_previous_tempo)));
-		}
+	if (loc->tempo().type() == TempoSection::Ramp) {
+		items.push_back (MenuElem (_("Set Constant"), sigc::mem_fun(*this, &Editor::toggle_tempo_type)));
 	}
 
 	TempoSection* next_ts = _session->tempo_map().next_tempo_section (&loc->tempo());
@@ -1009,16 +1017,16 @@ Editor::build_tempo_marker_menu (TempoMarker* loc, bool can_remove)
 		items.push_back (MenuElem (_("Ramp to Next"), sigc::mem_fun(*this, &Editor::ramp_to_next_tempo)));
 	}
 
-	if (loc->tempo().type() == TempoSection::Ramp) {
-		items.push_back (MenuElem (_("Set Constant"), sigc::mem_fun(*this, &Editor::toggle_tempo_type)));
-	}
-
 	if (loc->tempo().position_lock_style() == AudioTime && can_remove) {
+		items.push_back (SeparatorElem());
 		items.push_back (MenuElem (_("Lock to Music"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style)));
 	} else if (can_remove) {
+		items.push_back (SeparatorElem());
 		items.push_back (MenuElem (_("Lock to Audio"), sigc::mem_fun(*this, &Editor::toggle_marker_lock_style)));
 	}
 
+	items.push_back (SeparatorElem());
+
 	items.push_back (MenuElem (_("Edit..."), sigc::mem_fun(*this, &Editor::marker_menu_edit)));
 	items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
 	items.back().set_sensitive (can_remove);
@@ -1080,6 +1088,24 @@ Editor::marker_menu_hide ()
 	}
 }
 
+void
+Editor::marker_menu_set_origin ()
+{
+	ArdourMarker* marker;
+
+	if ((marker = reinterpret_cast<ArdourMarker *> (marker_menu_item->get_data ("marker"))) == 0) {
+		fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
+		abort(); /*NOTREACHED*/
+	}
+
+	Location* l;
+	bool is_start;
+
+	if ((l = find_location_from_marker (marker, is_start)) != 0) {
+		_session->locations()->set_clock_origin (l, this);
+	}
+}
+
 void
 Editor::marker_menu_select_using_range ()
 {
@@ -1094,7 +1120,7 @@ Editor::marker_menu_select_using_range ()
 	bool is_start;
 
 	if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
-	        set_selection_from_range (*l);
+		set_selection_from_range (*l);
 	}
 }
 
@@ -1112,7 +1138,7 @@ Editor::marker_menu_select_all_selectables_using_range ()
 	bool is_start;
 
 	if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
-	        select_all_within (l->start(), l->end() - 1, 0,  DBL_MAX, track_views, Selection::Set, false);
+		select_all_within (l->start(), l->end() - 1, 0,  DBL_MAX, track_views, Selection::Set, false);
 	}
 
 }
@@ -1131,7 +1157,7 @@ Editor::marker_menu_separate_regions_using_location ()
 	bool is_start;
 
 	if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
-	        separate_regions_using_location (*l);
+		separate_regions_using_location (*l);
 	}
 
 }
@@ -1214,11 +1240,11 @@ Editor::marker_menu_range_to_next ()
 		return;
 	}
 
-	framepos_t start;
-	framepos_t end;
+	samplepos_t start;
+	samplepos_t end;
 	_session->locations()->marks_either_side (marker->position(), start, end);
 
-	if (end != max_framepos) {
+	if (end != max_samplepos) {
 		string range_name = l->name();
 		range_name += "-range";
 
@@ -1244,13 +1270,13 @@ Editor::marker_menu_set_from_playhead ()
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
 		if (l->is_mark()) {
-			l->set_start (_session->audible_frame (), false, true, divisions);
+			l->set_start (_session->audible_sample (), false, true, divisions);
 		}
 		else {
 			if (is_start) {
-				l->set_start (_session->audible_frame (), false, true, divisions);
+				l->set_start (_session->audible_sample (), false, true, divisions);
 			} else {
-				l->set_end (_session->audible_frame (), false, true, divisions);
+				l->set_end (_session->audible_sample (), false, true, divisions);
 			}
 		}
 	}
@@ -1278,9 +1304,9 @@ Editor::marker_menu_set_from_selection (bool /*force_regions*/)
 		} else {
 
 			if (!selection->time.empty()) {
-				l->set (selection->time.start(), selection->time.end_frame());
+				l->set (selection->time.start(), selection->time.end_sample());
 			} else if (!selection->regions.empty()) {
-				l->set (selection->regions.start(), selection->regions.end_frame());
+				l->set (selection->regions.start(), selection->regions.end_sample());
 			}
 		}
 	}
@@ -1326,14 +1352,11 @@ Editor::marker_menu_loop_range ()
 	bool is_start;
 
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
-		Location* l2;
-		if ((l2 = transport_loop_location()) != 0) {
-			l2->set (l->start(), l->end());
-
-			// enable looping, reposition and start rolling
-			_session->request_locate (l2->start(), true);
-			_session->request_play_loop(true);
+		if (l != transport_loop_location()) {
+			set_loop_range (l->start(), l->end(), _("loop range from marker"));
 		}
+		_session->request_locate (l->start(), true);
+		_session->request_play_loop (true);
 	}
 }
 
@@ -1350,18 +1373,18 @@ Editor::marker_menu_zoom_to_range ()
 		return;
 	}
 
-	framecnt_t const extra = l->length() * 0.05;
-	framepos_t a = l->start ();
+	samplecnt_t const extra = l->length() * 0.05;
+	samplepos_t a = l->start ();
 	if (a >= extra) {
 		a -= extra;
 	}
 
-	framepos_t b = l->end ();
-	if (b < (max_framepos - extra)) {
+	samplepos_t b = l->end ();
+	if (b < (max_samplepos - extra)) {
 		b += extra;
 	}
 
-	temporal_zoom_by_frame (a, b);
+	temporal_zoom_by_sample (a, b);
 }
 
 void
@@ -1423,7 +1446,7 @@ Editor::toggle_marker_lock_style ()
 		const Timecode::BBT_Time bbt (msp->bbt());
 		const PositionLockStyle pls = (msp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
 
-		_session->tempo_map().replace_meter (*msp, meter, bbt, msp->frame(), pls);
+		_session->tempo_map().replace_meter (*msp, meter, bbt, msp->sample(), pls);
 
 		XMLNode &after = _session->tempo_map().get_state();
 		_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
@@ -1432,14 +1455,14 @@ Editor::toggle_marker_lock_style ()
 		TempoSection* tsp = &tm->tempo();
 
 		const double pulse = tsp->pulse();
-		const framepos_t frame = tsp->frame();
+		const samplepos_t sample = tsp->sample();
 		const PositionLockStyle pls = (tsp->position_lock_style() == AudioTime) ? MusicTime : AudioTime;
 		const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute());
 
 		begin_reversible_command (_("change tempo lock style"));
 		XMLNode &before = _session->tempo_map().get_state();
 
-		_session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, pls);
+		_session->tempo_map().replace_tempo (*tsp, tempo, pulse, sample, pls);
 
 		XMLNode &after = _session->tempo_map().get_state();
 		_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
@@ -1459,13 +1482,13 @@ Editor::toggle_tempo_type ()
 
 		const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type());
 		const double pulse = tsp->pulse();
-		const framepos_t frame = tsp->frame();
+		const samplepos_t sample = tsp->sample();
 		const PositionLockStyle pls = tsp->position_lock_style();
 
 		begin_reversible_command (_("set tempo to constant"));
 		XMLNode &before = _session->tempo_map().get_state();
 
-		_session->tempo_map().replace_tempo (*tsp, tempo, pulse, frame, pls);
+		_session->tempo_map().replace_tempo (*tsp, tempo, pulse, sample, pls);
 
 		XMLNode &after = _session->tempo_map().get_state();
 		_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
@@ -1501,35 +1524,6 @@ Editor::toggle_tempo_clamped ()
 	}
 }
 
-void
-Editor::continue_previous_tempo ()
-{
-	TempoMarker* tm;
-	MeterMarker* mm;
-	dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
-
-	if (tm) {
-		TempoMap& tmap (_session->tempo_map());
-		TempoSection* tsp = &tm->tempo();
-		TempoSection* prev_ts = tmap.previous_tempo_section (&tm->tempo());
-		if (prev_ts) {
-			const Tempo tempo (prev_ts->end_note_types_per_minute(), tsp->note_type(), tsp->end_note_types_per_minute());
-			const double pulse = tsp->pulse();
-			const framepos_t frame = tsp->frame();
-			const PositionLockStyle pls = tsp->position_lock_style();
-
-			begin_reversible_command (_("continue previous tempo"));
-			XMLNode &before = _session->tempo_map().get_state();
-
-			tmap.replace_tempo (*tsp, tempo, pulse, frame, pls);
-
-			XMLNode &after = _session->tempo_map().get_state();
-			_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
-			commit_reversible_command ();
-		}
-	}
-}
-
 void
 Editor::ramp_to_next_tempo ()
 {
@@ -1544,13 +1538,13 @@ Editor::ramp_to_next_tempo ()
 		if (next_ts) {
 			const Tempo tempo (tsp->note_types_per_minute(), tsp->note_type(), next_ts->note_types_per_minute());
 			const double pulse = tsp->pulse();
-			const framepos_t frame = tsp->frame();
+			const samplepos_t sample = tsp->sample();
 			const PositionLockStyle pls = tsp->position_lock_style();
 
 			begin_reversible_command (_("ramp to next tempo"));
 			XMLNode &before = _session->tempo_map().get_state();
 
-			tmap.replace_tempo (*tsp, tempo, pulse, frame, pls);
+			tmap.replace_tempo (*tsp, tempo, pulse, sample, pls);
 
 			XMLNode &after = _session->tempo_map().get_state();
 			_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
@@ -1607,13 +1601,15 @@ Editor::rename_marker(ArdourMarker *marker)
 
 	loc = find_location_from_marker (marker, is_start);
 
-	if (!loc)
-	       return;
+	if (!loc) {
+		return;
+	}
 
-	if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range())
+	if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range()) {
 		return;
+	}
 
-	ArdourPrompter dialog (true);
+	ArdourWidgets::Prompter dialog (true);
 	string txt;
 
 	dialog.set_prompt (_("New Name:"));
@@ -1720,7 +1716,7 @@ Editor::update_punch_range_view ()
 		if (_session->config.get_punch_out()) {
 			pixel_end = sample_to_pixel (tpl->end());
 		} else {
-			pixel_end = sample_to_pixel (max_framepos);
+			pixel_end = sample_to_pixel (max_samplepos);
 		}
 
 		transport_punch_range_rect->set_x0 (pixel_start);
@@ -1729,7 +1725,7 @@ Editor::update_punch_range_view ()
 
 	} else {
 
-	        transport_punch_range_rect->hide();
+		transport_punch_range_rect->hide();
 	}
 }
 
@@ -1750,9 +1746,9 @@ Editor::marker_selection_changed ()
 }
 
 struct SortLocationsByPosition {
-    bool operator() (Location* a, Location* b) {
-	    return a->start() < b->start();
-    }
+	bool operator() (Location* a, Location* b) {
+		return a->start() < b->start();
+	}
 };
 
 void