X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=75a96ef5a4fce987b7bbcaff71f2a6fa840d8af6;hb=ccf58b8de23619db9983a45f696fd97e13a15cce;hp=8a75492a307905ab0680adf40e32e6ba4cba586c;hpb=3733c995c5269756ca5941a9db50c6a965787508;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 8a75492a30..75a96ef5a4 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,23 +15,35 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include -#include +#include "ardour/tempo.h" + +#include "ardour_ui.h" +/* + * ardour_ui.h include was moved to the top of the list + * due to a conflicting definition of 'Rect' between + * Apple's MacTypes.h and GTK. + */ #include "marker.h" #include "public_editor.h" #include "utils.h" #include "canvas_impl.h" +#include "simpleline.h" + +#include #include "i18n.h" -Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, - Type type, jack_nframes_t frame, bool handle_events) +using namespace std; +using namespace ARDOUR; - : editor (ed), _type(type) +Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, + Type type, nframes_t frame, bool handle_events) + + : editor (ed), _parent(&parent), _type(type) { double label_offset = 0; @@ -43,7 +55,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con ^ | | V (0,5) (6,5) - \ / + \ / (3,10) @@ -60,65 +72,69 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con Start: - 0,0 -> 5,0 - | \ - | 10,5 - | / - 0,10 -> 5,10 + 0,0\ + | \ + | \ 6,6 + | / + | / + 0,12 End: - 5,0 -> 10,0 - / | - 0,5 | - \ | - 5,10 <-10,10 + /12,0 + / | + / | + 6,6 | + \ | + \ | + \ | + 12,12 + - TransportStart: - 0,0->3,0 - | | - | | - | | - | 3,8 -> 7,8 - | | - 0,11 ------ 7,11 + 0,0 + | \ + | \ + | \ + | \ + | \ + 0,13 --- 13,13 TransportEnd: - 4,0->7,0 - | | - | | - | | - 0,8 ---- 4,8 | - | | - 0,11 -------- 7,11 - + /13,0 + / | + / | + / | + / | + / | + 0,13 ------ 13,13 + PunchIn: - 0,0 ------> 8,0 + 0,0 ------> 13,0 | / | / - | 4,5 - | | - | | - | | - 0,11->4,11 + | / + | / + | / + | / + 0,13 PunchOut - 0,0 -->-8,0 - \ | + 0,0 -->-13,0 + \ | \ | - 4,5 | - | | - | | - | | - 4,11->8,11 - - + \ | + \ | + \ | + \ | + 13,13 + + */ switch (type) { @@ -128,10 +144,10 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con 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)); - + 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)); + shift = 3; label_offset = 8.0; break; @@ -141,11 +157,11 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con 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)); - 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)); + points->push_back (Gnome::Art::Point (3.0, 0.0)); shift = 3; label_offset = 8.0; @@ -153,84 +169,70 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con case Start: 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)); - points->push_back (Gnome::Art::Point (5.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - - shift = 10; - label_offset = 12.0; + points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (Gnome::Art::Point (6.5, 6.5)); + points->push_back (Gnome::Art::Point (0.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); + + shift = 0; + label_offset = 13.0; break; case End: 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)); - points->push_back (Gnome::Art::Point (5.0, 10.0)); - points->push_back (Gnome::Art::Point (0.0, 5.0)); - points->push_back (Gnome::Art::Point (5.0, 0.0)); - - shift = 0; - label_offset = 12.0; + points->push_back (Gnome::Art::Point (6.5, 6.5)); + points->push_back (Gnome::Art::Point (13.0, 0.0)); + points->push_back (Gnome::Art::Point (13.0, 13.0)); + points->push_back (Gnome::Art::Point (6.5, 6.5)); + + shift = 13; + label_offset = 6.0; break; case LoopStart: 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)); - points->push_back (Gnome::Art::Point (8.0, 8.0)); - points->push_back (Gnome::Art::Point (8.0, 11.0)); - points->push_back (Gnome::Art::Point (0.0, 11.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - + points->push_back (Gnome::Art::Point (13.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); + shift = 0; - label_offset = 11.0; + label_offset = 12.0; break; case LoopEnd: 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)); - points->push_back (Gnome::Art::Point (0.0, 8.0)); - points->push_back (Gnome::Art::Point (4.0, 8.0)); - points->push_back (Gnome::Art::Point (4.0, 0.0)); - points->push_back (Gnome::Art::Point (8.0, 0.0)); - - shift = 8; - label_offset = 11.0; + points->push_back (Gnome::Art::Point (13.0, 0.0)); + points->push_back (Gnome::Art::Point (13.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 13.0)); + points->push_back (Gnome::Art::Point (13.0, 0.0)); + + shift = 13; + label_offset = 0.0; break; case PunchIn: 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)); - points->push_back (Gnome::Art::Point (4.0, 11.0)); - points->push_back (Gnome::Art::Point (0.0, 11.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); + points->push_back (Gnome::Art::Point (13.0, 0.0)); + points->push_back (Gnome::Art::Point (0.0, 13.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); shift = 0; - label_offset = 10.0; + label_offset = 13.0; break; - + case PunchOut: 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)); - points->push_back (Gnome::Art::Point (4.0, 11.0)); - points->push_back (Gnome::Art::Point (4.0, 4.0)); - points->push_back (Gnome::Art::Point (0.0, 0.0)); - - shift = 8; - label_offset = 11.0; + points->push_back (Gnome::Art::Point (12.0, 0.0)); + points->push_back (Gnome::Art::Point (12.0, 12.0)); + points->push_back (Gnome::Art::Point (0.0, 0.0)); + + shift = 13; + label_offset = 0.0; break; - + } frame_position = frame; @@ -245,18 +247,28 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con mark = new Polygon (*group); mark->property_points() = *points; mark->property_fill_color_rgba() = rgba; - mark->property_outline_color() = "black"; + mark->property_outline_color_rgba() = rgba; mark->property_width_pixels() = 1; - Pango::FontDescription font = get_font_for_style (N_("MarkerText")); + /* setup name pixbuf sizes */ + name_font = get_font_for_style (N_("MarkerText")); + + Gtk::Window win; + Gtk::Label foo; + win.add (foo); + + Glib::RefPtr layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */ + int width; + int height; - 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"; + layout->set_font_description (*name_font); + Gtkmm2ext::get_ink_pixel_size (layout, width, height); + name_height = height + 6; + + name_pixbuf = new ArdourCanvas::Pixbuf(*group); + name_pixbuf->property_x() = label_offset; + + set_name (annotation.c_str()); editor.ZoomChanged.connect (mem_fun (*this, &Marker::reposition)); @@ -266,14 +278,73 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); } + line = 0; + } + Marker::~Marker () { + drop_references (); + /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ - delete text; + delete name_pixbuf; delete mark; delete points; + + delete line; + line = 0; +} + +void Marker::reparent(ArdourCanvas::Group & parent) +{ + group->reparent(parent); + _parent = &parent; +} + + +void +Marker::set_line_vpos (double pos, double height) +{ + if (line) { + line->property_y1() = pos; + line->property_y2() = pos + height; + } +} + +void +Marker::add_line (ArdourCanvas::Group* group, double y_origin, double initial_height) +{ + if (!line) { + + line = new ArdourCanvas::SimpleLine (*group); + line->property_color_rgba() = ARDOUR_UI::config()->canvasvar_EditPoint.get(); + line->property_x1() = unit_position + shift; + line->property_y1() = y_origin; + line->property_x2() = unit_position + shift; + line->property_y2() = y_origin + initial_height; + + line->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); + } + + show_line (); +} + +void +Marker::show_line () +{ + if (line) { + line->raise_to_top(); + line->show (); + } +} + +void +Marker::hide_line () +{ + if (line) { + line->hide (); + } } ArdourCanvas::Item& @@ -283,26 +354,37 @@ Marker::the_item() const } void -Marker::set_name (const string& name) +Marker::set_name (const string& new_name) { - text->property_text() = name.c_str(); + int name_width = pixel_width (new_name, *name_font) + 2; + + name_pixbuf->property_pixbuf() = pixbuf_from_ustring(new_name, name_font, name_width, name_height); + + if (_type == End || _type == LoopEnd || _type == PunchOut) { + name_pixbuf->property_x() = - (name_width); + } } void -Marker::set_position (jack_nframes_t frame) +Marker::set_position (nframes64_t frame) { double new_unit_position = editor.frame_to_unit (frame); new_unit_position -= shift; group->move (new_unit_position - unit_position, 0.0); frame_position = frame; unit_position = new_unit_position; + + if (line) { + line->property_x1() = unit_position + shift; + line->property_x2() = unit_position + shift; + } } void Marker::reposition () { set_position (frame_position); -} +} void Marker::show () @@ -320,11 +402,12 @@ void Marker::set_color_rgba (uint32_t color) { mark->property_fill_color_rgba() = color; + mark->property_outline_color_rgba() = color; } /***********************************************************************/ -TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, +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) @@ -339,8 +422,8 @@ TempoMarker::~TempoMarker () /***********************************************************************/ -MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, - ARDOUR::MeterSection& m) +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) {