X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=177f82bd44b24946236f8031fc7d88cd951b3cc0;hb=2592a320d42dd4a157ee16101c042d875d3142be;hp=f4351fe51845b140563a67736995ed7ecbaf900b;hpb=e22a48723ed192d54045ba91d4012f4cab1f276f;p=ardour.git

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index f4351fe518..177f82bd44 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -27,6 +27,7 @@
 #include <libgnomecanvasmm.h>
 
 #include <pbd/error.h>
+#include <pbd/memento_command.h>
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
@@ -43,12 +44,14 @@
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "color.h"
+#include "time_axis_view.h"
 
 #include "i18n.h"
 
 using namespace std;
 using namespace sigc;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace Editing;
@@ -67,10 +70,14 @@ Editor::remove_metric_marks ()
 void
 Editor::draw_metric_marks (const Metrics& metrics)
 {
+
+        const MeterSection *ms;
+	const TempoSection *ts;
+	char buf[64];
+	
+	remove_metric_marks ();
+	
 	for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
-		const MeterSection *ms;
-		const TempoSection *ts;
-		char buf[64];
 		
 		if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
 			snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
@@ -83,20 +90,43 @@ Editor::draw_metric_marks (const Metrics& metrics)
 		}
 		
 	}
+
 }
 
 void
 Editor::tempo_map_changed (Change ignored)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
-	
+        ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
+
+	BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
+
+	session->bbt_time(leftmost_frame, previous_beat);
+	session->bbt_time(leftmost_frame + current_page_frames(), next_beat);
+
+	if (previous_beat.beats > 1) {
+	        previous_beat.beats -= 1;
+	} else if (previous_beat.bars > 1) {
+ 	        previous_beat.bars--;
+		previous_beat.beats += 1;
+	}
+	previous_beat.ticks = 0;
+
+	if (session->tempo_map().meter_at(leftmost_frame + current_page_frames()).beats_per_bar () > next_beat.beats + 1) {
+	  next_beat.beats += 1;
+	} else {
+	  next_beat.bars += 1;
+	  next_beat.beats = 1;
+	}
+	next_beat.ticks = 0;
+
 	if (current_bbt_points) {
-		delete current_bbt_points;
+	        delete current_bbt_points;
 		current_bbt_points = 0;
 	}
 
 	if (session) {
-		current_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames());
+		current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat));
+		update_tempo_based_rulers ();
 	} else {
 		current_bbt_points = 0;
 	}
@@ -106,24 +136,20 @@ Editor::tempo_map_changed (Change ignored)
 
 void
 Editor::redisplay_tempo ()
-{
-	update_tempo_based_rulers ();
-
-	remove_metric_marks ();	
-	hide_measures ();
+{	
 
 	if (session && current_bbt_points) {
-		session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-		draw_measures ();
+		Glib::signal_idle().connect (mem_fun (*this, &Editor::lazy_hide_and_draw_measures));
+	} else {
+		hide_measures ();
 	}
-	
 }
 
 void
 Editor::hide_measures ()
 {
 	for (TimeLineList::iterator i = used_measure_lines.begin(); i != used_measure_lines.end(); ++i) {
-		(*i)->hide();
+      		(*i)->hide();
 		free_measure_lines.push_back (*i);
 	}
 	used_measure_lines.clear ();
@@ -146,6 +172,14 @@ Editor::get_time_line ()
 	return line;
 }
 
+bool
+Editor::lazy_hide_and_draw_measures ()
+{
+	hide_measures ();
+	draw_measures ();
+	return false;
+}
+
 void
 Editor::draw_measures ()
 {
@@ -154,95 +188,77 @@ Editor::draw_measures ()
 	}
 
 	TempoMap::BBTPointList::iterator i;
-	TempoMap::BBTPointList *all_bbt_points;
 	ArdourCanvas::SimpleLine *line;
-	gdouble xpos, last_xpos;
-	uint32_t cnt;
+	gdouble xpos;
+	double x1, x2, y1, y2, beat_density;
+
+        uint32_t beats = 0;
+        uint32_t bars = 0;
 	uint32_t color;
 
 	if (current_bbt_points == 0 || current_bbt_points->empty()) {
 		return;
 	}
 
-	all_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames());
-
-	cnt = 0;
-	last_xpos = 0;
+	track_canvas.get_scroll_region (x1, y1, x2, y2);
+	y2 = TimeAxisView::hLargest*5000; // five thousand largest tracks should be enough.. :)
 
 	/* get the first bar spacing */
 
-	gdouble last_beat = DBL_MAX;
-	gdouble beat_spacing = 0;
-
-	for (i = all_bbt_points->begin(); i != all_bbt_points->end() && beat_spacing == 0; ++i) {
-		TempoMap::BBTPoint& p = (*i);
+	i = current_bbt_points->end();
+	i--;
+	bars = (*i).bar - (*current_bbt_points->begin()).bar;
+	beats = current_bbt_points->size() - bars;
 
-		switch (p.type) {
-		case TempoMap::Bar:
-			break;
+	beat_density =  (beats * 10.0f) / track_canvas.get_width ();
 
-		case TempoMap::Beat:
-			xpos = frame_to_unit (p.frame);
-			if (last_beat < xpos) {
-				beat_spacing = xpos - last_beat;
-			}
-			last_beat = xpos;
-		}
+	if (beat_density > 4.0f) {
+		/* if the lines are too close together, they become useless
+		 */
+		return;
 	}
 
-	double x1, x2, y1, y2;
-	track_canvas.get_scroll_region (x1, y1, x2, y2);
-
-	for (i = all_bbt_points->begin(); i != all_bbt_points->end(); ++i) {
-
-		TempoMap::BBTPoint& p = (*i);
+	for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) {
 
-		switch (p.type) {
+		switch ((*i).type) {
 		case TempoMap::Bar:
 			break;
 
 		case TempoMap::Beat:
-			xpos = frame_to_unit (p.frame);
 			
-			if (p.beat == 1) {
+			if ((*i).beat == 1) {
 				color = color_map[cMeasureLineBeat];
 			} else {
 				color = color_map[cMeasureLineBar];
 
-				/* only draw beat lines if the gaps between beats
-				   are large.
-				*/
-
-				if (beat_spacing < 25.0) {
+				if (beat_density > 2.0) {
+					/* only draw beat lines if the gaps between beats are large.
+					*/
 					break;
 				}
 			}
-			
-			if (cnt == 0 || xpos - last_xpos > 4.0) {
-				line = get_time_line ();
-				line->property_x1() = xpos;
-				line->property_x2() = xpos;
-				line->property_y2() = y2;
-				line->property_color_rgba() = color;
-				line->raise_to_top();
-				line->show();
-				last_xpos = xpos;	
-				++cnt;
-			} 
+
+			xpos = frame_to_unit ((*i).frame);
+			line = get_time_line ();
+			line->property_x1() = xpos;
+			line->property_x2() = xpos;
+			line->property_y2() = y2;
+			line->property_color_rgba() = color;
+			//line->raise_to_top();
+			line->show();	
 			break;
 		}
 	}
 
-	delete all_bbt_points;
-
 	/* the cursors are always on top of everything */
 
 	cursor_group->raise_to_top();
 	time_line_group->lower_to_bottom();
+	return;
 }
 
 void
-Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
+Editor::mouse_add_new_tempo_event (nframes_t frame)
 {
 	if (session == 0) {
 		return;
@@ -272,16 +288,19 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
 	tempo_dialog.get_bbt_time (requested);
 	
 	begin_reversible_command (_("add tempo mark"));
-	session->add_undo (map.get_memento());
+        XMLNode &before = map.get_state();
 	map.add_tempo (Tempo (bpm), requested);
-	session->add_redo_no_execute (map.get_memento());
+        XMLNode &after = map.get_state();
+	session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
 	commit_reversible_command ();
 	
 	map.dump (cerr);
+
+	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
-Editor::mouse_add_new_meter_event (jack_nframes_t frame)
+Editor::mouse_add_new_meter_event (nframes_t frame)
 {
 	if (session == 0) {
 		return;
@@ -312,12 +331,14 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame)
 	meter_dialog.get_bbt_time (requested);
 	
 	begin_reversible_command (_("add meter mark"));
-	session->add_undo (map.get_memento());
+        XMLNode &before = map.get_state();
 	map.add_meter (Meter (bpb, note_type), requested);
-	session->add_redo_no_execute (map.get_memento());
+	session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
 	commit_reversible_command ();
 	
 	map.dump (cerr);
+
+	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -363,10 +384,13 @@ Editor::edit_meter_section (MeterSection* section)
 	double note_type = meter_dialog.get_note_type ();
 
 	begin_reversible_command (_("replace tempo mark"));
-	session->add_undo (session->tempo_map().get_memento());
+        XMLNode &before = session->tempo_map().get_state();
 	session->tempo_map().replace_meter (*section, Meter (bpb, note_type));
-	session->add_redo_no_execute (session->tempo_map().get_memento());
+        XMLNode &after = session->tempo_map().get_state();
+	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
+
+	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -391,11 +415,14 @@ Editor::edit_tempo_section (TempoSection* section)
 	bpm = max (0.01, bpm);
 	
 	begin_reversible_command (_("replace tempo mark"));
-	session->add_undo (session->tempo_map().get_memento());
+        XMLNode &before = session->tempo_map().get_state();
 	session->tempo_map().replace_tempo (*section, Tempo (bpm));
 	session->tempo_map().move_tempo (*section, when);
-	session->add_redo_no_execute (session->tempo_map().get_memento());
+        XMLNode &after = session->tempo_map().get_state();
+	session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
+
+	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -440,11 +467,14 @@ gint
 Editor::real_remove_tempo_marker (TempoSection *section)
 {
 	begin_reversible_command (_("remove tempo mark"));
-	session->add_undo (session->tempo_map().get_memento());
+	XMLNode &before = session->tempo_map().get_state();
 	session->tempo_map().remove_tempo (*section);
-	session->add_redo_no_execute (session->tempo_map().get_memento());
+	XMLNode &after = session->tempo_map().get_state();
+	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 
+	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
+
 	return FALSE;
 }
 
@@ -473,9 +503,13 @@ gint
 Editor::real_remove_meter_marker (MeterSection *section)
 {
 	begin_reversible_command (_("remove tempo mark"));
-	session->add_undo (session->tempo_map().get_memento());
+	XMLNode &before = session->tempo_map().get_state();
 	session->tempo_map().remove_meter (*section);
-	session->add_redo_no_execute (session->tempo_map().get_memento());
+	XMLNode &after = session->tempo_map().get_state();
+	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
+
+	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
+
 	return FALSE;
 }