projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 65d772db3e30fd4f278f8ebf1737170d00ce0dad..e5b1a67cf3fb8ac73d097635450addf30fa0560f 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -24,9 +24,10 @@
 #include <string>
 #include <climits>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 
 #include <pbd/error.h>
+#include <pbd/memento_command.h>
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/gtk_ui.h>
@@ -34,6 +35,7 @@
 #include <ardour/session.h>
 #include <ardour/tempo.h>
 #include <gtkmm2ext/doi.h>
+#include <gtkmm2ext/utils.h>
 
 #include "editor.h"
 #include "marker.h"
@@ -41,13 +43,16 @@
 #include "tempo_dialog.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
+#include "color.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;
 
 void
@@ -129,11 +134,10 @@ Editor::hide_measures ()
 ArdourCanvas::SimpleLine *
 Editor::get_time_line ()
 {
-         ArdourCanvas::SimpleLine *line;
+       ArdourCanvas::SimpleLine *line;
 
        if (free_measure_lines.empty()) {
-               line = new ArdourCanvas::SimpleLine (*time_line_group);
-               // cerr << "measure line @ " << line << endl;
+               line = new ArdourCanvas::SimpleLine (*time_line_group);
                used_measure_lines.push_back (line);
        } else {
                line = free_measure_lines.front();
@@ -180,7 +184,7 @@ Editor::draw_measures ()
                        break;
 
                case TempoMap::Beat:
-                       xpos = p.frame / (gdouble) frames_per_unit;
+                       xpos = frame_to_unit (p.frame);
                        if (last_beat < xpos) {
                                beat_spacing = xpos - last_beat;
                        }
@@ -188,6 +192,10 @@ Editor::draw_measures ()
                }
        }
 
+       double x1, x2, y1, y2;
+       track_canvas.get_scroll_region (x1, y1, x2, y2);
+       y2 = 1000000000.0f;
+
        for (i = all_bbt_points->begin(); i != all_bbt_points->end(); ++i) {
 
                TempoMap::BBTPoint& p = (*i);
@@ -197,8 +205,8 @@ Editor::draw_measures ()
                        break;
 
                case TempoMap::Beat:
-                       xpos = p.frame / (gdouble) frames_per_unit;
-
+                       xpos = frame_to_unit (p.frame);
+                       
                        if (p.beat == 1) {
                                color = color_map[cMeasureLineBeat];
                        } else {
@@ -208,16 +216,16 @@ Editor::draw_measures ()
                                   are large.
                                */
 
-                               if (beat_spacing < 25.0) {
+                               if (beat_spacing < 15.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() = (gdouble) canvas_height;
+                               line->property_y2() = y2;
                                line->property_color_rgba() = color;
                                line->raise_to_top();
                                line->show();
@@ -247,9 +255,7 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
        TempoDialog tempo_dialog (map, frame, _("add"));
        
        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));
+       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);
 
@@ -269,9 +275,10 @@ 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);
@@ -289,9 +296,7 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame)
        MeterDialog meter_dialog (map, frame, _("add"));
 
        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));
+       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);
        
@@ -311,9 +316,9 @@ 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);
@@ -346,9 +351,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);
 
@@ -365,9 +367,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 ();
 }
 
@@ -377,9 +380,6 @@ 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);
        
@@ -396,10 +396,11 @@ 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 ();
 }
 
@@ -445,9 +446,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;
@@ -478,9 +480,10 @@ 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;
 }
Unnamed repository; edit this file 'description' to name the repository.