X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=ad9551b87f60a6b2e5562db939dbe637d878c62b;hb=7db39a206e6ab9f43299e6b8ae148d90b2ee6c4d;hp=fecdeb0ecb206e081289210541939dd9e8eff6a5;hpb=663814bf22a18964270598852ae406818bb863ba;p=ardour.git

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index fecdeb0ecb..ad9551b87f 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -69,19 +69,25 @@ Editor::remove_metric_marks ()
 		delete_when_idle (*x);
 	}
 	metric_marks.clear ();
+
+	for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ++x) {
+		delete (*x);
+	}
+	tempo_curves.clear ();
 }
 
 void
 Editor::draw_metric_marks (const Metrics& metrics)
 {
-
-	const MeterSection *ms;
-	const TempoSection *ts;
 	char buf[64];
+	double max_tempo = 0.0;
+	double min_tempo = DBL_MAX;
 
-	remove_metric_marks ();
+	remove_metric_marks (); // also clears tempo curves
 
 	for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
+		const MeterSection *ms;
+		const TempoSection *ts;
 
 		if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
 			snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ());
@@ -89,16 +95,43 @@ Editor::draw_metric_marks (const Metrics& metrics)
 								 *(const_cast<MeterSection*>(ms))));
 		} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
 			if (UIConfiguration::instance().get_allow_non_quarter_pulse()) {
-				snprintf (buf, sizeof (buf), "%.2f/%.0f", ts->beats_per_minute(), ts->note_type());
+				snprintf (buf, sizeof (buf), "%.3f/%.0f", ts->beats_per_minute(), ts->note_type());
 			} else {
-				snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
+				snprintf (buf, sizeof (buf), "%.3f", ts->beats_per_minute());
 			}
+
+			max_tempo = max (max_tempo, ts->beats_per_minute());
+			min_tempo = min (min_tempo, ts->beats_per_minute());
+
+			tempo_curves.push_back (new TempoCurve (*this, *tempo_group, UIConfiguration::instance().color ("range drag rect"),
+								*(const_cast<TempoSection*>(ts)), ts->frame(), false));
 			metric_marks.push_back (new TempoMarker (*this, *tempo_group, UIConfiguration::instance().color ("tempo marker"), buf,
 								 *(const_cast<TempoSection*>(ts))));
+
 		}
 
 	}
 
+	for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ) {
+		Curves::iterator tmp = x;
+		(*x)->set_max_tempo (max_tempo);
+		(*x)->set_min_tempo (min_tempo);
+		++tmp;
+		if (tmp != tempo_curves.end()) {
+			(*x)->set_position ((*x)->tempo().frame(), (*tmp)->tempo().frame());
+		} else {
+			(*x)->set_position ((*x)->tempo().frame(), UINT32_MAX);
+		}
+		++x;
+	}
+
+	for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
+		TempoMarker* tempo_marker;
+
+		if ((tempo_marker = dynamic_cast<TempoMarker*> (*x)) != 0) {
+			tempo_marker->update_height_mark ((tempo_marker->tempo().beats_per_minute() - min_tempo) / (max_tempo - min_tempo));
+		}
+	}
 }
 
 
@@ -122,6 +155,12 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/)
 	update_tempo_based_rulers (grid);
 }
 
+struct CurveComparator {
+	bool operator() (TempoCurve const * a, TempoCurve const * b) {
+		return a->position() < b->position();
+	}
+};
+
 void
 Editor::marker_position_changed ()
 {
@@ -134,18 +173,25 @@ Editor::marker_position_changed ()
 	if (tempo_lines) {
 		tempo_lines->tempo_map_changed();
 	}
-	TempoMarker* tempo_marker;
-	MeterMarker* meter_marker;
-	const TempoSection *ts;
-	const MeterSection *ms;
+
+	double max_tempo = 0.0;
+	double min_tempo = DBL_MAX;
 
 	for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
+		TempoMarker* tempo_marker;
+		MeterMarker* meter_marker;
+		const TempoSection *ts;
+		const MeterSection *ms;
+
 		if ((tempo_marker = dynamic_cast<TempoMarker*> (*x)) != 0) {
 			if ((ts = &tempo_marker->tempo()) != 0) {
 				tempo_marker->set_position (ts->frame ());
 				char buf[64];
-				snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
+				snprintf (buf, sizeof (buf), "%.3f", ts->beats_per_minute());
 				tempo_marker->set_name (buf);
+
+				max_tempo = max (max_tempo, ts->beats_per_minute());
+				min_tempo = min (min_tempo, ts->beats_per_minute());
 			}
 		}
 		if ((meter_marker = dynamic_cast<MeterMarker*> (*x)) != 0) {
@@ -154,6 +200,29 @@ Editor::marker_position_changed ()
 			}
 		}
 	}
+
+	tempo_curves.sort (CurveComparator());
+
+	for (Curves::iterator x = tempo_curves.begin(); x != tempo_curves.end(); ) {
+		Curves::iterator tmp = x;
+		(*x)->set_max_tempo (max_tempo);
+		(*x)->set_min_tempo (min_tempo);
+		++tmp;
+		if (tmp != tempo_curves.end()) {
+			(*x)->set_position ((*x)->tempo().frame(), (*tmp)->tempo().frame());
+		} else {
+			(*x)->set_position ((*x)->tempo().frame(), UINT32_MAX);
+		}
+		++x;
+	}
+
+	for (Marks::iterator x = metric_marks.begin(); x != metric_marks.end(); ++x) {
+		TempoMarker* tempo_marker;
+		if ((tempo_marker = dynamic_cast<TempoMarker*> (*x)) != 0) {
+			tempo_marker->update_height_mark ((tempo_marker->tempo().beats_per_minute() - min_tempo) / max (max_tempo - min_tempo, 10.0));
+		}
+	}
+
 	std::vector<TempoMap::BBTPoint> grid;
 	compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples());
 	draw_measures (grid);
@@ -189,7 +258,8 @@ Editor::compute_current_bbt_points (std::vector<TempoMap::BBTPoint>& grid, frame
 
 	/* prevent negative values of leftmost from creeping into tempomap
 	 */
-	_session->tempo_map().get_grid (grid, max (leftmost, (framepos_t) 0), rightmost);
+	const double lower_beat = floor (_session->tempo_map().beat_at_frame (leftmost)) - 1.0;
+	_session->tempo_map().get_grid (grid, max (_session->tempo_map().frame_at_beat (lower_beat), (framepos_t) 0), rightmost);
 }
 
 void
@@ -223,35 +293,19 @@ Editor::mouse_add_new_tempo_event (framepos_t frame)
 	}
 
 	TempoMap& map(_session->tempo_map());
-	TempoDialog tempo_dialog (map, frame, _("add"));
-
-	//this causes compiz to display no border.
-	//tempo_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
 
-	switch (tempo_dialog.run()) {
-	case RESPONSE_ACCEPT:
-		break;
-	default:
-		return;
-	}
+	begin_reversible_command (_("add tempo mark"));
+	const double pulse = map.pulse_at_frame (frame);
 
-	double bpm = 0;
-	Timecode::BBT_Time requested;
-	bpm = tempo_dialog.get_bpm ();
-	double nt = tempo_dialog.get_note_type();
-	bpm = max (0.01, bpm);
+	if (pulse > 0.0) {
+		XMLNode &before = map.get_state();
+		/* add music-locked ramped (?) tempo using the bpm/note type at frame*/
+		map.add_tempo (map.tempo_at (frame), pulse, 0, TempoSection::Ramp, MusicTime);
 
-	tempo_dialog.get_bbt_time (requested);
-	begin_reversible_command (_("add tempo mark"));
-        XMLNode &before = map.get_state();
-	if (tempo_dialog.get_lock_style() == MusicTime) {
-		map.add_tempo (Tempo (bpm,nt), map.pulse_at_beat (map.bbt_to_beats (requested)), tempo_dialog.get_tempo_type());
-	} else {
-		map.add_tempo (Tempo (bpm,nt), frame, tempo_dialog.get_tempo_type());
+		XMLNode &after = map.get_state();
+		_session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
+		commit_reversible_command ();
 	}
-        XMLNode &after = map.get_state();
-	_session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
-	commit_reversible_command ();
 
 	//map.dump (cerr);
 }
@@ -267,9 +321,6 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
 	TempoMap& map(_session->tempo_map());
 	MeterDialog meter_dialog (map, frame, _("add"));
 
-	//this causes compiz to display no border..
-	//meter_dialog.signal_realize().connect (sigc::bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
-
 	switch (meter_dialog.run ()) {
 	case RESPONSE_ACCEPT:
 		break;
@@ -287,11 +338,13 @@ Editor::mouse_add_new_meter_event (framepos_t frame)
 
 	begin_reversible_command (_("add meter mark"));
         XMLNode &before = map.get_state();
+
 	if (meter_dialog.get_lock_style() == MusicTime) {
-		map.add_meter (Meter (bpb, note_type), map.bbt_to_beats (requested), requested);
+		map.add_meter (Meter (bpb, note_type), map.bbt_to_beats (requested), requested, 0, MusicTime);
 	} else {
-		map.add_meter (Meter (bpb, note_type), frame, meter_dialog.get_lock_style());
+		map.add_meter (Meter (bpb, note_type), map.bbt_to_beats (requested), requested, map.frame_time (requested), AudioTime);
 	}
+
 	_session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
 	commit_reversible_command ();
 
@@ -341,13 +394,10 @@ Editor::edit_meter_section (MeterSection* section)
 
 	begin_reversible_command (_("replace meter mark"));
         XMLNode &before = _session->tempo_map().get_state();
-	section->set_position_lock_style (meter_dialog.get_lock_style());
-	if (meter_dialog.get_lock_style() == MusicTime) {
-		_session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when);
-	} else {
-		_session->tempo_map().replace_meter (*section, Meter (bpb, note_type), frame);
-	}
-        XMLNode &after = _session->tempo_map().get_state();
+
+	_session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when, frame, meter_dialog.get_lock_style());
+
+	XMLNode &after = _session->tempo_map().get_state();
 	_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 }
@@ -369,22 +419,15 @@ Editor::edit_tempo_section (TempoSection* section)
 	Timecode::BBT_Time when;
 
 	tempo_dialog.get_bbt_time (when);
-	double const beat = _session->tempo_map().bbt_to_beats (when);
 
 	bpm = max (0.01, bpm);
 
 	begin_reversible_command (_("replace tempo mark"));
 	XMLNode &before = _session->tempo_map().get_state();
 
-	if (tempo_dialog.get_lock_style() == MusicTime) {
-		section->set_position_lock_style (MusicTime);
-		framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when);
-		double const p = _session->tempo_map().predict_tempo_pulse (section, f);
-		_session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), p, tempo_dialog.get_tempo_type());
-	} else {
-		framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when);
-		_session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), f, tempo_dialog.get_tempo_type());
-	}
+	framepos_t const f = _session->tempo_map().predict_tempo_frame (section, when);
+	double const p = _session->tempo_map().predict_tempo_pulse (section, f);
+	_session->tempo_map().replace_tempo (*section, Tempo (bpm, nt), p, f, tempo_dialog.get_tempo_type(), tempo_dialog.get_lock_style());
 
 	XMLNode &after = _session->tempo_map().get_state();
 	_session->add_command (new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));