Merged with trunk R846

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 2e4e092ebd4e01a76dcbc962e7f6286b8189a8d1..e5b1a67cf3fb8ac73d097635450addf30fa0560f 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -216,7 +216,7 @@ Editor::draw_measures ()
                                   are large.
                                */
 
-                               if (beat_spacing < 25.0) {
+                               if (beat_spacing < 15.0) {
                                        break;
                                }
                        }
@@ -278,7 +278,7 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
         XMLNode &before = map.get_state();
        map.add_tempo (Tempo (bpm), requested);
         XMLNode &after = map.get_state();
-       session->add_command(new MementoCommand<TempoMap>(map, before, after));
+       session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
        commit_reversible_command ();
        
        map.dump (cerr);
@@ -318,7 +318,7 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame)
        begin_reversible_command (_("add meter mark"));
         XMLNode &before = map.get_state();
        map.add_meter (Meter (bpb, note_type), requested);
-       session->add_command(new MementoCommand<TempoMap>(map, before, map.get_state()));
+       session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
        commit_reversible_command ();
        
        map.dump (cerr);
@@ -370,7 +370,7 @@ Editor::edit_meter_section (MeterSection* section)
         XMLNode &before = session->tempo_map().get_state();
        session->tempo_map().replace_meter (*section, Meter (bpb, note_type));
         XMLNode &after = session->tempo_map().get_state();
-       session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), before, after));
+       session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
        commit_reversible_command ();
 }
 
@@ -400,7 +400,7 @@ Editor::edit_tempo_section (TempoSection* section)
        session->tempo_map().replace_tempo (*section, Tempo (bpm));
        session->tempo_map().move_tempo (*section, when);
         XMLNode &after = session->tempo_map().get_state();
-       session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), before, after));
+       session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
        commit_reversible_command ();
 }
 
@@ -449,7 +449,7 @@ Editor::real_remove_tempo_marker (TempoSection *section)
        XMLNode &before = session->tempo_map().get_state();
        session->tempo_map().remove_tempo (*section);
        XMLNode &after = session->tempo_map().get_state();
-       session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), before, after));
+       session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
        commit_reversible_command ();
 
        return FALSE;
@@ -483,7 +483,7 @@ Editor::real_remove_meter_marker (MeterSection *section)
        XMLNode &before = session->tempo_map().get_state();
        session->tempo_map().remove_meter (*section);
        XMLNode &after = session->tempo_map().get_state();
-       session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), before, after));
+       session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
        commit_reversible_command ();
        return FALSE;
 }