the return of VST support

[ardour.git] / gtk2_ardour / editor_tempodisplay.cc

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index c3436119672683f2c8378510e06103a89a073002..5f998ada9fa5a0602c39cb874a790d9b8e5ffb60 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -24,7 +24,7 @@
 #include <string>
 #include <climits>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 
 #include <pbd/error.h>
 
@@ -34,20 +34,24 @@
 #include <ardour/session.h>
 #include <ardour/tempo.h>
 #include <gtkmm2ext/doi.h>
+#include <gtkmm2ext/utils.h>
 
 #include "editor.h"
 #include "marker.h"
-#include "canvas-simpleline.h"
+#include "simpleline.h"
 #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
@@ -126,14 +130,13 @@ Editor::hide_measures ()
        used_measure_lines.clear ();
 }
 
-ArdourCanvas::Line *
+ArdourCanvas::SimpleLine *
 Editor::get_time_line ()
 {
-         ArdourCanvas::Line *line;
+         ArdourCanvas::SimpleLine *line;
 
        if (free_measure_lines.empty()) {
-               line = new ArdourCanvas::Line (*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();
@@ -153,7 +156,7 @@ Editor::draw_measures ()
 
        TempoMap::BBTPointList::iterator i;
        TempoMap::BBTPointList *all_bbt_points;
-       ArdourCanvas::Line *line;
+       ArdourCanvas::SimpleLine *line;
        gdouble xpos, last_xpos;
        uint32_t cnt;
        uint32_t color;
@@ -180,7 +183,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 +191,9 @@ Editor::draw_measures ()
                }
        }
 
+       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);
@@ -197,8 +203,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 {
@@ -212,13 +218,13 @@ Editor::draw_measures ()
                                        break;
                                }
                        }
-
+                       
                        if (cnt == 0 || xpos - last_xpos > 4.0) {
                                line = get_time_line ();
-                               line->set_property ("x1", xpos);
-                               line->set_property ("x2", xpos);
-                               line->set_property ("y2", (gdouble) canvas_height);
-                               line->set_property ("color_rgba", color);
+                               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;       
@@ -247,9 +253,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);
 
@@ -289,9 +293,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);
        
@@ -325,7 +327,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item)
        Marker* marker;
        TempoMarker* tempo_marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
                fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -346,9 +348,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);
 
@@ -377,9 +376,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);
        
@@ -409,7 +405,7 @@ Editor::edit_tempo_marker (ArdourCanvas::Item *item)
        Marker* marker;
        TempoMarker* tempo_marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
                fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -428,7 +424,7 @@ Editor::edit_meter_marker (ArdourCanvas::Item *item)
        Marker* marker;
        MeterMarker* meter_marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
                fatal << _("programming error: tempo marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -459,7 +455,7 @@ Editor::remove_meter_marker (ArdourCanvas::Item* item)
        Marker* marker;
        MeterMarker* meter_marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (item->get_data ("marker"))) == 0) {
                fatal << _("programming error: meter marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }