X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=a15697eb2067ddb4bfcbf7407b798f333fe779ee;hb=b1a99f89da52018d3995592eb821f8e4a3c89a28;hp=42bc98b134d52ca79abc4ce31aee1c9c596ce48f;hpb=adacfd9b24fb0ac7c4029cd659d21107eb7a2208;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 42bc98b134..a15697eb20 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -18,17 +18,18 @@ $Id$ */ +#include #include #include "marker.h" #include "public_editor.h" -#include "canvas-simpleline.h" #include "utils.h" +#include "canvas_impl.h" #include "i18n.h" -Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, const string& annotation, - Type type, gint (*callback)(Gnome::Canvas::Item *, GdkEvent *, gpointer), jack_nframes_t frame) +Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, + Type type, jack_nframes_t frame, bool handle_events) : editor (ed), _type(type) { @@ -122,14 +123,12 @@ Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, co switch (type) { case Mark: - points = new Gnome::Canvas::Points (); + points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (0.0, 0.0)); points->push_back (Gnome::Art::Point (6.0, 0.0)); - points->push_back (Gnome::Art::Point (6.0, 5.0)); points->push_back (Gnome::Art::Point (3.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 5.0)); points->push_back (Gnome::Art::Point (0.0, 0.0)); @@ -140,10 +139,9 @@ Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, co case Tempo: case Meter: - points = new Gnome::Canvas::Points (); + points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (3.0, 0.0)); points->push_back (Gnome::Art::Point (6.0, 5.0)); - points->push_back (Gnome::Art::Point (6.0, 10.0)); points->push_back (Gnome::Art::Point (0.0, 10.0)); points->push_back (Gnome::Art::Point (0.0, 5.0)); @@ -154,7 +152,7 @@ Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, co break; case Start: - points = new Gnome::Canvas::Points (); + points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (0.0, 0.0)); points->push_back (Gnome::Art::Point (5.0, 0.0)); points->push_back (Gnome::Art::Point (10.0, 5.0)); @@ -167,7 +165,7 @@ Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, co break; case End: - points = new Gnome::Canvas::Points (); + points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (5.0, 0.0)); points->push_back (Gnome::Art::Point (10.0, 0.0)); points->push_back (Gnome::Art::Point (10.0, 10.0)); @@ -180,7 +178,7 @@ Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, co break; case LoopStart: - points = new Gnome::Canvas::Points (); + points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (0.0, 0.0)); points->push_back (Gnome::Art::Point (4.0, 0.0)); points->push_back (Gnome::Art::Point (4.0, 8.0)); @@ -194,7 +192,7 @@ Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, co break; case LoopEnd: - points = new Gnome::Canvas::Points (); + points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (8.0, 0.0)); points->push_back (Gnome::Art::Point (8.0, 11.0)); points->push_back (Gnome::Art::Point (0.0, 11.0)); @@ -208,7 +206,7 @@ Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, co break; case PunchIn: - points = new Gnome::Canvas::Points (); + points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (0.0, 0.0)); points->push_back (Gnome::Art::Point (8.0, 0.0)); points->push_back (Gnome::Art::Point (4.0, 4.0)); @@ -221,7 +219,7 @@ Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, co break; case PunchOut: - points = new Gnome::Canvas::Points (); + points = new ArdourCanvas::Points (); points->push_back (Gnome::Art::Point (0.0, 0.0)); points->push_back (Gnome::Art::Point (8.0, 0.0)); points->push_back (Gnome::Art::Point (8.0, 11.0)); @@ -243,38 +241,52 @@ Marker::Marker (PublicEditor& ed, Gnome::Canvas::Group& parent, guint32 rgba, co unit_position -= shift; group = &parent; - group->set_property ("x", unit_position); - group->set_property ("y", 1.0); + group->property_x() = unit_position; + group->property_y() = 1.0; // cerr << "set mark al points, nc = " << points->num_points << endl; - mark = new Gnome::Canvas::Polygon (*group); - mark->set_property ("points", points); - mark->set_property ("fill_color_rgba", rgba); - mark->set_property ("outline_color", Gdk::Color ("black")); + mark = new Polygon (*group); + mark->property_points() = *points; + mark->property_fill_color_rgba() = rgba; + mark->property_outline_color() = "black"; Pango::FontDescription font = get_font_for_style (N_("MarkerText")); - text = new Gnome::Canvas::Text (*group); - text->set_property ("text", annotation.c_str()); - text->set_property ("x", label_offset); - text->set_property ("y", 0.0); - text->set_property ("fontdesc", font); - text->set_property ("anchor", Gtk::ANCHOR_NW); - text->set_property ("fill_color", Gdk::Color ("black")); + text = new Text (*group); + text->property_text() = annotation.c_str(); + text->property_x() = label_offset; + text->property_y() = 0.0; + text->property_font_desc() = font; + text->property_anchor() = Gtk::ANCHOR_NW; + text->property_fill_color() = "black"; + + editor.ZoomChanged.connect (mem_fun (*this, &Marker::reposition)); + + mark->set_data ("marker", this); + + if (handle_events) { + group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); + } - group->signal_event().connect() (bind (mem_fun (editor, &PublicEditor::reposition), group, this)); } Marker::~Marker () { - /* destroying the group destroys its contents */ - gtk_object_destroy (GTK_OBJECT(group)); - gnome_canvas_points_unref (points->gobj()); + /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ + delete text; + delete mark; + delete points; +} + +ArdourCanvas::Item& +Marker::the_item() const +{ + return *mark; } void Marker::set_name (const string& name) { - text->set_property ("text", name.c_str()); + text->property_text() = name.c_str(); } void @@ -308,19 +320,18 @@ Marker::hide () void Marker::set_color_rgba (uint32_t color) { - mark->set_property ("fill_color_rgba", color); + mark->property_fill_color_rgba() = color; } /***********************************************************************/ -TempoMarker::TempoMarker (PublicEditor& editor, Gnome::Canvas::Group& parent, guint32 rgba, const string& text, - ARDOUR::TempoSection& temp, - gint (*callback)(Gnome::Canvas::Item *, GdkEvent *, gpointer)) - : Marker (editor, parent, rgba, text, Tempo, callback, 0), +TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, + ARDOUR::TempoSection& temp) + : Marker (editor, parent, rgba, text, Tempo, 0, false), _tempo (temp) { set_position (_tempo.frame()); - group->set_data ("tempo_marker", this); + group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), mark, this)); } TempoMarker::~TempoMarker () @@ -329,16 +340,16 @@ TempoMarker::~TempoMarker () /***********************************************************************/ -MeterMarker::MeterMarker (PublicEditor& editor, Gnome::Canvas::Group& parent, guint32 rgba, const string& text, - ARDOUR::MeterSection& m, - gint (*callback)(Gnome::Canvas::Item *, GdkEvent *, gpointer)) - : Marker (editor, parent, rgba, text, Meter, callback, 0), +MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, + ARDOUR::MeterSection& m) + : Marker (editor, parent, rgba, text, Meter, 0, false), _meter (m) { set_position (_meter.frame()); - gtk_object_set_data (GTK_OBJECT(group), "meter_marker", this); + group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_meter_marker_event), mark, this)); } MeterMarker::~MeterMarker () { } +