X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.cc;h=9bc475214ac24f2709942ef92a6f2f6e5135575f;hb=73a6b8ef25bb90ad6c66b25b17da5962a38291d2;hp=e5d792988b3ca9ac9365fc07707a9202fb1301e6;hpb=3ff9964885eee5f7654e5ae562cadfaa1e998fe9;p=ardour.git diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index e5d792988b..9bc475214a 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -15,25 +15,30 @@ 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 "marker.h" #include "public_editor.h" #include "utils.h" #include "canvas_impl.h" +#include "ardour_ui.h" +#include "simpleline.h" #include "i18n.h" +using namespace std; +using namespace ARDOUR; + Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, - Type type, jack_nframes_t frame, bool handle_events) + Type type, nframes_t frame, bool handle_events) - : editor (ed), _type(type) + : editor (ed), _parent(&parent), _type(type) { double label_offset = 0; + bool annotate_left = false; /* Shapes we use: @@ -60,63 +65,67 @@ 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 */ @@ -153,82 +162,71 @@ 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)); + 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 = 10; - label_offset = 12.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)); + 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 = 0; - label_offset = 12.0; + 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 (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)); + 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 = 8; - label_offset = 11.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 (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 (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 (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 = 8; - label_offset = 11.0; + shift = 13; + label_offset = 0.0; + annotate_left = true; break; } @@ -240,24 +238,29 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con unit_position -= shift; - group = &parent; - group->set_property ("x", unit_position); - group->set_property ("y", 1.0); - // cerr << "set mark al points, nc = " << points->num_points << endl; - mark = new Polygon (*group); - mark->set_property ("points", points); - mark->set_property ("fill_color_rgba", rgba); - mark->set_property ("outline_color", Gdk::Color ("black")); - - Pango::FontDescription font = get_font_for_style (N_("MarkerText")); + group = new Group (parent, unit_position, 1.0); + mark = new Polygon (*group); + mark->property_points() = *points; + 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")); + //cerr << " font->get_size() = " << font->get_size() << " is_absolute = " << pango_font_description_get_size_is_absolute(font->gobj()) << " to_string = " << font->to_string() << endl; text = new 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->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(); editor.ZoomChanged.connect (mem_fun (*this, &Marker::reposition)); @@ -267,14 +270,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 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& @@ -286,17 +348,25 @@ Marker::the_item() const void Marker::set_name (const string& name) { - text->set_property ("text", name.c_str()); + text->property_text() = name.c_str(); + if (_type == End) { + text->property_x() = -(text->property_text_width()); + } } void -Marker::set_position (jack_nframes_t frame) +Marker::set_position (nframes_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 @@ -320,7 +390,8 @@ Marker::hide () void Marker::set_color_rgba (uint32_t color) { - mark->set_property ("fill_color_rgba", color); + mark->property_fill_color_rgba() = color; + mark->property_outline_color_rgba() = color; } /***********************************************************************/