X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=be7203f2db5f3044f821b898202a0954b08d67bf;hb=73a6b8ef25bb90ad6c66b25b17da5962a38291d2;hp=3aa95d022f1d9462bdef750d86598cda90087089;hpb=982d639d44f23ac46aa19ddb08055fa8cec9b0fd;p=ardour.git

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 3aa95d022f..be7203f2db 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdio> // for sprintf, grrr 
@@ -26,13 +25,14 @@
 
 #include <libgnomecanvasmm.h>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/memento_command.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/session.h>
-#include <ardour/tempo.h>
+#include "ardour/session.h"
+#include "ardour/tempo.h"
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/utils.h>
 
@@ -42,13 +42,16 @@
 #include "tempo_dialog.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
-#include "color.h"
+#include "time_axis_view.h"
+#include "ardour_ui.h"
+#include "tempo_lines.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,182 +70,133 @@ 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 ());
-			metric_marks.push_back (new MeterMarker (*this, *meter_group, color_map[cMeterMarker], buf, 
+			metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf, 
 								 *(const_cast<MeterSection*>(ms))));
 		} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
 			snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
-			metric_marks.push_back (new TempoMarker (*this, *tempo_group, color_map[cTempoMarker], buf, 
+			metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf, 
 								 *(const_cast<TempoSection*>(ts))));
 		}
 		
 	}
+
 }
 
 void
 Editor::tempo_map_changed (Change ignored)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
-	
-	if (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());
-	} else {
-		current_bbt_points = 0;
+	if (!session) {
+		return;
 	}
 
-	redisplay_tempo ();
-}
+	ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
 
-void
-Editor::redisplay_tempo ()
-{
-	update_tempo_based_rulers ();
-
-	remove_metric_marks ();	
-	hide_measures ();
+	if (tempo_lines)
+		tempo_lines->tempo_map_changed();
 
-	if (session && current_bbt_points) {
-		session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-		draw_measures ();
-	}
-	
+	compute_current_bbt_points(leftmost_frame, leftmost_frame + current_page_frames());
+	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
+	redraw_measures ();
 }
 
 void
-Editor::hide_measures ()
+Editor::redisplay_tempo (bool immediate_redraw)
 {
-	for (TimeLineList::iterator i = used_measure_lines.begin(); i != used_measure_lines.end(); ++i) {
-		(*i)->hide();
-		free_measure_lines.push_back (*i);
+	if (!session) {
+		return;
 	}
-	used_measure_lines.clear ();
-}
-
-ArdourCanvas::SimpleLine *
-Editor::get_time_line ()
-{
-         ArdourCanvas::SimpleLine *line;
+	
+	compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures
 
-	if (free_measure_lines.empty()) {
-	        line = new ArdourCanvas::SimpleLine (*time_line_group);
-		used_measure_lines.push_back (line);
+	compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames());
+	if (immediate_redraw) {
+		redraw_measures ();
 	} else {
-		line = free_measure_lines.front();
-		free_measure_lines.erase (free_measure_lines.begin());
-		used_measure_lines.push_back (line);
+#ifdef GTKOSX
+		redraw_measures ();
+#else
+		Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures));
+#endif
 	}
-
-	return line;
+	update_tempo_based_rulers (); // redraw rulers and measures
 }
 
 void
-Editor::draw_measures ()
+Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
 {
-	if (session == 0 || _show_measures == false) {
+	if (!session) {
 		return;
 	}
 
-	TempoMap::BBTPointList::iterator i;
-	TempoMap::BBTPointList *all_bbt_points;
-	ArdourCanvas::SimpleLine *line;
-	gdouble xpos, last_xpos;
-	uint32_t cnt;
-	uint32_t color;
+	BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
 
-	if (current_bbt_points == 0 || current_bbt_points->empty()) {
-		return;
-	}
+	session->bbt_time(leftmost, previous_beat);
+	session->bbt_time(rightmost, next_beat);
 
-	all_bbt_points = session->tempo_map().get_points (leftmost_frame, leftmost_frame + current_page_frames());
-
-	cnt = 0;
-	last_xpos = 0;
+	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;
 
-	/* get the first bar spacing */
+	if (session->tempo_map().meter_at(rightmost).beats_per_bar () > next_beat.beats + 1) {
+		next_beat.beats += 1;
+	} else {
+		next_beat.bars += 1;
+		next_beat.beats = 1;
+	}
+	next_beat.ticks = 0;
+	
+	delete current_bbt_points;
+	current_bbt_points = 0;
 
-	gdouble last_beat = DBL_MAX;
-	gdouble beat_spacing = 0;
+	current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1);
+}
 
-	for (i = all_bbt_points->begin(); i != all_bbt_points->end() && beat_spacing == 0; ++i) {
-		TempoMap::BBTPoint& p = (*i);
+void
+Editor::hide_measures ()
+{
+	if (tempo_lines)
+		tempo_lines->hide();
+}
 
-		switch (p.type) {
-		case TempoMap::Bar:
-			break;
+bool
+Editor::redraw_measures ()
+{
+	draw_measures ();
+	return false;
+}
 
-		case TempoMap::Beat:
-			xpos = frame_to_unit (p.frame);
-			if (last_beat < xpos) {
-				beat_spacing = xpos - last_beat;
-			}
-			last_beat = xpos;
-		}
+void
+Editor::draw_measures ()
+{
+	if (session == 0 || _show_measures == false || 
+	    !current_bbt_points || current_bbt_points->empty()) {
+		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);
-
-		switch (p.type) {
-		case TempoMap::Bar:
-			break;
-
-		case TempoMap::Beat:
-			xpos = frame_to_unit (p.frame);
-			
-			if (p.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) {
-					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;
-			} 
-			break;
-		}
+	if (tempo_lines == 0) {
+		tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height);
 	}
 
-	delete all_bbt_points;
-
-	/* the cursors are always on top of everything */
-
-	cursor_group->raise_to_top();
-	time_line_group->lower_to_bottom();
+	tempo_lines->draw(*current_bbt_points, frames_per_unit);
 }
 
 void
-Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
+Editor::mouse_add_new_tempo_event (nframes64_t frame)
 {
 	if (session == 0) {
 		return;
@@ -252,7 +206,8 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
 	TempoDialog tempo_dialog (map, frame, _("add"));
 	
 	tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
-	tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
+	//this causes compiz to display no border.
+	//tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
 
 	ensure_float (tempo_dialog);
 
@@ -267,21 +222,23 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
 	BBT_Time requested;
 	
 	bpm = tempo_dialog.get_bpm ();
+	double nt = tempo_dialog.get_note_type();
 	bpm = max (0.01, bpm);
 	
 	tempo_dialog.get_bbt_time (requested);
 	
 	begin_reversible_command (_("add tempo mark"));
-	session->add_undo (map.get_memento());
-	map.add_tempo (Tempo (bpm), requested);
-	session->add_redo_no_execute (map.get_memento());
+        XMLNode &before = map.get_state();
+	map.add_tempo (Tempo (bpm,nt), requested);
+        XMLNode &after = map.get_state();
+	session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
 	commit_reversible_command ();
 	
-	map.dump (cerr);
+	//map.dump (cerr);
 }
 
 void
-Editor::mouse_add_new_meter_event (jack_nframes_t frame)
+Editor::mouse_add_new_meter_event (nframes64_t frame)
 {
 	if (session == 0) {
 		return;
@@ -292,7 +249,9 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame)
 	MeterDialog meter_dialog (map, frame, _("add"));
 
 	meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-	meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
+
+	//this causes compiz to display no border.. 
+	//meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
 
 	ensure_float (meter_dialog);
 	
@@ -308,16 +267,16 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame)
 	
 	double note_type = meter_dialog.get_note_type ();
 	BBT_Time requested;
-	
+
 	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);
+	//map.dump (cerr);
 }
 
 void
@@ -347,9 +306,6 @@ Editor::edit_meter_section (MeterSection* section)
 	MeterDialog meter_dialog (*section, _("done"));
 
 	meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
-	// GTK2FIX
-	// meter_dialog.realize ();
-	// meter_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
 
 	ensure_float (meter_dialog);
 
@@ -366,9 +322,10 @@ 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 ();
 }
 
@@ -378,12 +335,9 @@ Editor::edit_tempo_section (TempoSection* section)
 	TempoDialog tempo_dialog (*section, _("done"));
 
 	tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
-	// GTK2FIX
-	// tempo_dialog.realize ();
-	// tempo_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
 
 	ensure_float (tempo_dialog);
-	
+
 	switch (tempo_dialog.run ()) {
 	case RESPONSE_ACCEPT:
 		break;
@@ -392,15 +346,21 @@ Editor::edit_tempo_section (TempoSection* section)
 	}
 
 	double bpm = tempo_dialog.get_bpm ();
+	double nt = tempo_dialog.get_note_type ();
 	BBT_Time when;
 	tempo_dialog.get_bbt_time(when);
 	bpm = max (0.01, bpm);
-	
+
+	cerr << "Editing tempo section to be at " << when << endl;
+	session->tempo_map().dump (cerr);
 	begin_reversible_command (_("replace tempo mark"));
-	session->add_undo (session->tempo_map().get_memento());
-	session->tempo_map().replace_tempo (*section, Tempo (bpm));
+	XMLNode &before = session->tempo_map().get_state();
+	session->tempo_map().replace_tempo (*section, Tempo (bpm,nt));
+	session->tempo_map().dump (cerr);
 	session->tempo_map().move_tempo (*section, when);
-	session->add_redo_no_execute (session->tempo_map().get_memento());
+	session->tempo_map().dump (cerr);
+	XMLNode &after = session->tempo_map().get_state();
+	session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 }
 
@@ -446,9 +406,10 @@ 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 ();
 
 	return FALSE;
@@ -479,9 +440,11 @@ 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 ();
+
 	return FALSE;
 }