X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=3df253b4acec848f4f070f979c99d8c38990a4c0;hb=de5e463904de7b58218a5bb1e9080ba5353bb985;hp=edfec8a600b466c8fb15454fa0fffbe8ea602cfb;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index edfec8a600..3df253b4ac 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 @@ -18,26 +18,34 @@ */ #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 "ardour_ui.h" #include "simpleline.h" +#include + #include "i18n.h" +using namespace std; using namespace ARDOUR; -Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, +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; - bool annotate_left = false; /* Shapes we use: @@ -47,7 +55,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con ^ | | V (0,5) (6,5) - \ / + \ / (3,10) @@ -64,17 +72,17 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con Start: - 0,0\ - | \ + 0,0\ + | \ | \ 6,6 | / | / - 0,12 + 0,12 End: /12,0 - / | + / | / | 6,6 | \ | @@ -82,15 +90,15 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con \ | 12,12 - + TransportStart: 0,0 - | \ - | \ - | \ + | \ + | \ + | \ | \ - | \ + | \ 0,13 --- 13,13 TransportEnd: @@ -102,7 +110,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con / | / | 0,13 ------ 13,13 - + PunchIn: @@ -110,23 +118,23 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con | / | / | / - | / - | / - | / + | / + | / + | / 0,13 PunchOut 0,0 -->-13,0 - \ | + \ | \ | \ | \ | \ | \ | 13,13 - - + + */ switch (type) { @@ -136,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; @@ -149,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; @@ -161,10 +169,10 @@ 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 (6.5, 6.5)); - points->push_back (Gnome::Art::Point (0.0, 13.0)); - points->push_back (Gnome::Art::Point (0.0, 0.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; @@ -173,22 +181,21 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con case End: points = new ArdourCanvas::Points (); 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)); - + 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; - annotate_left = true; break; case LoopStart: points = new ArdourCanvas::Points (); - 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)); - + 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 = 12.0; break; @@ -196,38 +203,36 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con case LoopEnd: points = new ArdourCanvas::Points (); 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, 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; - annotate_left = true; break; case PunchIn: points = new ArdourCanvas::Points (); 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)); + 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 = 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 (12.0, 0.0)); - points->push_back (Gnome::Art::Point (12.0, 12.0)); - points->push_back (Gnome::Art::Point (0.0, 0.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; - annotate_left = true; break; - + } frame_position = frame; @@ -244,22 +249,26 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con mark->property_fill_color_rgba() = rgba; mark->property_outline_color_rgba() = rgba; mark->property_width_pixels() = 1; - Pango::FontDescription* font = get_font_for_style (N_("MarkerText")); - - text = new Text (*group); - text->property_font_desc() = *font; - text->property_text() = annotation.c_str(); - - delete font; - - if (annotate_left) { - text->property_x() = -(text->property_text_width()); - } else { - text->property_x() = label_offset; - } - text->property_y() = 0.0; - text->property_anchor() = Gtk::ANCHOR_NW; - text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerLabel.get(); + + /* 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; + + 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)); @@ -279,14 +288,12 @@ 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; - if (line) { - delete line; - line = 0; - } + delete line; + line = 0; } void Marker::reparent(ArdourCanvas::Group & parent) @@ -332,7 +339,7 @@ Marker::show_line () } } -void +void Marker::hide_line () { if (line) { @@ -347,16 +354,43 @@ Marker::the_item() const } void -Marker::set_name (const string& name) +Marker::set_name (const string& new_name) { - text->property_text() = name.c_str(); - if (_type == End) { - text->property_x() = -(text->property_text_width()); - } + uint32_t pb_width; + double font_size; + + font_size = name_font->get_size() / Pango::SCALE; + pb_width = new_name.length() * font_size; + + Glib::RefPtr buf = Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, true, 8, pb_width, name_height); + + cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, pb_width, name_height); + cairo_t *cr = cairo_create (surface); + cairo_text_extents_t te; + cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0); + cairo_select_font_face (cr, name_font->get_family().c_str(), + CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); + cairo_set_font_size (cr, font_size); + cairo_text_extents (cr, new_name.c_str(), &te); + + cairo_move_to (cr, 0.5, + 0.5 - te.height / 2 - te.y_bearing + name_height / 2); + cairo_show_text (cr, new_name.c_str()); + + unsigned char* src = cairo_image_surface_get_data (surface); + convert_bgra_to_rgba(src, buf->get_pixels(), pb_width, name_height); + + cairo_destroy(cr); + name_pixbuf->property_pixbuf() = buf; + + if (_type == End || _type == LoopEnd || _type == PunchOut) { + name_pixbuf->property_x() = -(te.width); + } + } void -Marker::set_position (nframes_t frame) +Marker::set_position (nframes64_t frame) { double new_unit_position = editor.frame_to_unit (frame); new_unit_position -= shift; @@ -374,7 +408,7 @@ void Marker::reposition () { set_position (frame_position); -} +} void Marker::show () @@ -397,7 +431,7 @@ Marker::set_color_rgba (uint32_t 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) @@ -412,8 +446,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) {