summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/editor.cc6
-rw-r--r--gtk2_ardour/editor.h3
-rw-r--r--gtk2_ardour/editor_canvas.cc36
-rw-r--r--gtk2_ardour/marker.cc79
-rw-r--r--gtk2_ardour/marker.h10
-rw-r--r--gtk2_ardour/region_view.h1
-rw-r--r--gtk2_ardour/time_axis_view_item.cc38
-rw-r--r--gtk2_ardour/utils.cc32
-rw-r--r--gtk2_ardour/utils.h7
9 files changed, 113 insertions, 99 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index d1553bb50c..569a1d0a2f 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -300,7 +300,6 @@ Editor::Editor ()
_show_measures = true;
_show_waveforms = true;
_show_waveforms_recording = true;
- first_action_message = 0;
show_gain_after_trim = false;
route_redisplay_does_not_sync_order_keys = false;
route_redisplay_does_not_reset_order_keys = false;
@@ -1255,10 +1254,6 @@ Editor::connect_to_session (Session *t)
session->request_locate (playhead_cursor->current_frame);
- if (first_action_message) {
- first_action_message->hide();
- }
-
update_title ();
session->GoingAway.connect (mem_fun(*this, &Editor::session_going_away));
@@ -4721,6 +4716,7 @@ Editor::post_zoom ()
}
}
+ leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
ZoomChanged (); /* EMIT_SIGNAL */
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index ffe0154fe4..2e21fe391c 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -592,7 +592,6 @@ class Editor : public PublicEditor
ArdourCanvas::Canvas* track_canvas;
- ArdourCanvas::Text* first_action_message;
ArdourCanvas::Text* verbose_canvas_cursor;
bool verbose_cursor_visible;
@@ -897,8 +896,6 @@ class Editor : public PublicEditor
void tie_vertical_scrolling ();
void scroll_canvas_horizontally ();
void scroll_canvas_vertically ();
- void canvas_horizontally_scrolled ();
- void canvas_scroll_to (nframes64_t);
struct VisualChange {
enum Type {
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 428334dfc6..a92f58a133 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -833,20 +833,17 @@ Editor::scroll_canvas_horizontally ()
{
nframes64_t time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
- if (time_origin != leftmost_frame) {
- canvas_scroll_to (time_origin);
- }
-
/* horizontal scrolling only */
- double x1, x2, y1, y2, x_delta;
+ double x_delta;
- _master_group->get_bounds(x1, y1, x2, y2);
- x_delta = x1 + horizontal_adjustment.get_value();
+ x_delta = (leftmost_frame - time_origin) / frames_per_unit;
- _master_group->move (-x_delta, 0);
- timebar_group->move (-x_delta, 0);
- time_line_group->move (-x_delta, 0);
- cursor_group->move (-x_delta, 0);
+ _master_group->move (x_delta, 0);
+ timebar_group->move (x_delta, 0);
+ time_line_group->move (x_delta, 0);
+ cursor_group->move (x_delta, 0);
+
+ leftmost_frame = time_origin;
update_fixed_rulers ();
redisplay_tempo (true);
@@ -881,23 +878,6 @@ Editor::scroll_canvas_vertically ()
track_canvas->update_now ();
}
-void
-Editor::canvas_horizontally_scrolled ()
-{
- nframes64_t time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
-
- if (time_origin != leftmost_frame) {
- canvas_scroll_to (time_origin);
- }
- redisplay_tempo (true);
-}
-
-void
-Editor::canvas_scroll_to (nframes64_t time_origin)
-{
- leftmost_frame = time_origin;
-}
-
void
Editor::color_handler()
{
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 9bc475214a..392ba85152 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -27,6 +27,8 @@
#include "ardour_ui.h"
#include "simpleline.h"
+#include <gtkmm2ext/utils.h>
+
#include "i18n.h"
using namespace std;
@@ -38,7 +40,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
: editor (ed), _parent(&parent), _type(type)
{
double label_offset = 0;
- bool annotate_left = false;
/* Shapes we use:
@@ -180,7 +181,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
shift = 13;
label_offset = 6.0;
- annotate_left = true;
break;
case LoopStart:
@@ -203,7 +203,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
shift = 13;
label_offset = 0.0;
- annotate_left = true;
break;
case PunchIn:
@@ -226,7 +225,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
shift = 13;
label_offset = 0.0;
- annotate_left = true;
break;
}
@@ -245,23 +243,27 @@ 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"));
- //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->property_font_desc() = *font;
- text->property_text() = annotation.c_str();
- delete font;
+ /* 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());
- 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));
mark->set_data ("marker", this);
@@ -280,7 +282,7 @@ 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;
@@ -346,12 +348,39 @@ 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<Gdk::Pixbuf> 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
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index d1bc12561f..fe6cac75c4 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -22,6 +22,9 @@
#include <string>
#include <glib.h>
+
+#include <libgnomecanvasmm/pixbuf.h>
+
#include "ardour/ardour.h"
#include "pbd/destructible.h"
@@ -79,10 +82,12 @@ class Marker : public PBD::Destructible
protected:
PublicEditor& editor;
+ Pango::FontDescription* name_font;
+
ArdourCanvas::Group * _parent;
ArdourCanvas::Group *group;
ArdourCanvas::Polygon *mark;
- ArdourCanvas::Text *text;
+ ArdourCanvas::Pixbuf *name_pixbuf;
ArdourCanvas::Points *points;
ArdourCanvas::SimpleLine *line;
ArdourCanvas::Points *line_points;
@@ -90,7 +95,8 @@ class Marker : public PBD::Destructible
double unit_position;
nframes64_t frame_position;
unsigned char shift; /* should be double, but its always small and integral */
- Type _type;
+ Type _type;
+ int name_height;
void reposition ();
};
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index fea5cd9588..25c4eb8714 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -30,7 +30,6 @@
#include "time_axis_view_item.h"
#include "automation_line.h"
#include "enums.h"
-#include "waveview.h"
#include "canvas.h"
class TimeAxisView;
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 013a04054c..722b939f57 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -54,38 +54,6 @@ double TimeAxisViewItem::NAME_Y_OFFSET;
double TimeAxisViewItem::NAME_HIGHLIGHT_SIZE;
double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH;
-inline guint8
-convert_color_channel (guint8 src,
- guint8 alpha)
-{
- return alpha ? ((guint (src) << 8) - src) / alpha : 0;
-}
-
-void
-convert_bgra_to_rgba (guint8 const* src,
- guint8* dst,
- int width,
- int height)
-{
- guint8 const* src_pixel = src;
- guint8* dst_pixel = dst;
-
- for (int y = 0; y < height; y++)
- for (int x = 0; x < width; x++)
- {
- dst_pixel[0] = convert_color_channel (src_pixel[2],
- src_pixel[3]);
- dst_pixel[1] = convert_color_channel (src_pixel[1],
- src_pixel[3]);
- dst_pixel[2] = convert_color_channel (src_pixel[0],
- src_pixel[3]);
- dst_pixel[3] = src_pixel[3];
-
- dst_pixel += 4;
- src_pixel += 4;
- }
-}
-
//---------------------------------------------------------------------------------------//
// Constructor / Desctructor
@@ -561,8 +529,6 @@ TimeAxisViewItem::set_name_text(const ustring& new_name)
uint32_t pb_width, it_width;
double font_size;
- if (!name_pixbuf) return;
-
font_size = NAME_FONT->get_size() / Pango::SCALE;
it_width = trackview.editor().frame_to_pixel(item_duration);
pb_width = new_name.length() * font_size;
@@ -572,7 +538,9 @@ TimeAxisViewItem::set_name_text(const ustring& new_name)
}
if (pb_width <= 0 || it_width < NAME_X_OFFSET) {
- name_pixbuf->hide();
+ if (name_pixbuf) {
+ name_pixbuf->hide();
+ }
return;
} else {
name_pixbuf->show();
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 9378b6727c..f5490c025a 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -824,3 +824,35 @@ possibly_translate_keyval_to_make_legal_accelerator (uint32_t& keyval)
return false;
}
+
+inline guint8
+convert_color_channel (guint8 src,
+ guint8 alpha)
+{
+ return alpha ? ((guint (src) << 8) - src) / alpha : 0;
+}
+
+void
+convert_bgra_to_rgba (guint8 const* src,
+ guint8* dst,
+ int width,
+ int height)
+{
+ guint8 const* src_pixel = src;
+ guint8* dst_pixel = dst;
+
+ for (int y = 0; y < height; y++)
+ for (int x = 0; x < width; x++)
+ {
+ dst_pixel[0] = convert_color_channel (src_pixel[2],
+ src_pixel[3]);
+ dst_pixel[1] = convert_color_channel (src_pixel[1],
+ src_pixel[3]);
+ dst_pixel[2] = convert_color_channel (src_pixel[0],
+ src_pixel[3]);
+ dst_pixel[3] = src_pixel[3];
+
+ dst_pixel += 4;
+ src_pixel += 4;
+ }
+}
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index b6ce0160ea..eb74864a78 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -89,4 +89,11 @@ bool key_is_legal_for_numeric_entry (guint keyval);
void reset_dpi ();
void set_pango_fontsize ();
+inline guint8 convert_color_channel (guint8 src, guint8 alpha);
+void convert_bgra_to_rgba (guint8 const* src,
+ guint8* dst,
+ int width,
+ int height);
+
+
#endif /* __ardour_gtk_utils_h__ */
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-21 20:35:01 +0000