/*
- 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
*/
#include <sigc++/bind.h>
-#include <ardour/tempo.h>
+#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 <gtkmm2ext/utils.h>
+
#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:
^ |
| V
(0,5) (6,5)
- \ /
+ \ /
(3,10)
Start:
- 0,0\
- | \
+ 0,0\
+ | \
| \ 6,6
| /
| /
- 0,12
+ 0,12
End:
/12,0
- / |
+ / |
/ |
6,6 |
\ |
\ |
12,12
-
+
TransportStart:
0,0
- | \
- | \
- | \
+ | \
+ | \
+ | \
| \
- | \
+ | \
0,13 --- 13,13
TransportEnd:
/ |
/ |
0,13 ------ 13,13
-
+
PunchIn:
| /
| /
| /
- | /
- | /
- | /
+ | /
+ | /
+ | /
0,13
PunchOut
0,0 -->-13,0
- \ |
+ \ |
\ |
\ |
\ |
\ |
\ |
13,13
-
-
+
+
*/
switch (type) {
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;
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;
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;
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;
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;
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_text() = annotation.c_str();
- text->property_font_desc() = *font;
-
- 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));
+ /* setup name pixbuf sizes */
+ name_font = get_font_for_style (N_("MarkerText"));
+
+ Gtk::Window win;
+ Gtk::Label foo;
+ win.add (foo);
+
+ Glib::RefPtr<Pango::Layout> 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 (sigc::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 (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this));
}
line = 0;
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;
- }
+ delete line;
+ line = 0;
}
void Marker::reparent(ArdourCanvas::Group & parent)
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));
+ line->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this));
}
show_line ();
}
}
-void
+void
Marker::hide_line ()
{
if (line) {
}
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());
+ 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, Gdk::Color ("#000000"));
+
+ if (_type == End || _type == LoopEnd || _type == PunchOut) {
+ name_pixbuf->property_x() = - (name_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;
Marker::reposition ()
{
set_position (frame_position);
-}
+}
void
Marker::show ()
/***********************************************************************/
-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)
{
set_position (_tempo.frame());
- group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), mark, this));
+ group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_marker_event), mark, this));
}
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)
{
set_position (_meter.frame());
- group->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_meter_marker_event), mark, this));
+ group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_meter_marker_event), mark, this));
}
MeterMarker::~MeterMarker ()
projects / ardour.git / blobdiff