Fix record crash, use pixfufs instead of canvas text in markers, use leftmost_frame...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5101 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index d8902f8ece12eaa6b1fe088fb5dbb985f70575e4..6bb25267509575071f0a4ad96551abcded5f3226 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -294,7 +294,6 @@ Editor::Editor ()
        _show_measures = true;
        _show_waveforms = true;
        _show_waveforms_recording = true;
-       first_action_message = 0;
        export_dialog = 0;
        export_range_markers_dialog = 0;
        show_gain_after_trim = false;
@@ -1193,10 +1192,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));
@@ -4451,6 +4446,8 @@ Editor::post_zoom ()
                playhead_cursor->set_position (playhead_cursor->current_frame);
        }
 
+       leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
+
        ZoomChanged (); /* EMIT_SIGNAL */
 
        reset_hscrollbar_stepping ();

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 1ce860c689383f3c771ca1967f9df75af8794996..564f4c282a32e52fc4c53013630077960a4810e3 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -589,8 +589,6 @@ class Editor : public PublicEditor
        Gdk::Cursor* which_grabber_cursor ();
 
        ArdourCanvas::Canvas* track_canvas;
-
-       ArdourCanvas::Text* first_action_message;
        ArdourCanvas::Text* verbose_canvas_cursor;
        bool                 verbose_cursor_visible;
 
@@ -861,8 +859,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 c5cb652e66918c16d9a76fd7c0583677abd7a796..fa347c2a636e6cc83fdc6f74c6ccc7e7cdc2f911 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -834,20 +834,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);
@@ -882,23 +879,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 48b840358484aa854a2f666fab398952d9f42201..6d00052430ac59bcdebd75cc882e366fccc15f17 100644 (file)
--- 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"
 
 Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, 
@@ -35,7 +37,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:
 
@@ -177,7 +178,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
                
                shift = 13;
                label_offset = 6.0;
-               annotate_left = true;
                break;
 
        case LoopStart:
@@ -200,7 +200,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
                
                shift = 13;
                label_offset = 0.0;
-               annotate_left = true;
                break;
 
        case  PunchIn:
@@ -223,7 +222,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
 
                shift = 13;
                label_offset = 0.0;
-               annotate_left = true;
                break;
                
        }
@@ -242,22 +240,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"));
-       //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);
        
-       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();
+       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 (mem_fun (*this, &Marker::reposition));
 
@@ -277,7 +279,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;
 
@@ -345,11 +347,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();
-       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);
        }
 }
 

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 1a53726ede0992833ce38f438a06b335b2dcd0b2..0f01f1d7944ad8caa47e0c4d6818e5775fe00cbd 100644 (file)
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -25,6 +25,8 @@
 #include <ardour/ardour.h>
 #include <pbd/destructible.h>
 
+#include <libgnomecanvasmm/pixbuf.h>
+
 #include "canvas.h"
 
 namespace ARDOUR {
@@ -79,10 +81,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,8 +94,9 @@ 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/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index f8387f5fcef9dfd3a740959816b530dfb2a718cb..725a6c05bf75ad88548d9481427360a6fd2b66c4 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -53,38 +53,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
 
@@ -169,6 +137,7 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo
        show_vestigial = true;
        visibility = vis;
        _sensitive = true;
+       name_pixbuf = 0;
 
        if (duration == 0) {
                warning << "Time Axis Item Duration == 0" << endl ;
@@ -584,7 +553,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 2e98fad06e7dde84e813920b3b11628d109804ee..d4228781dea41e961f48ebdd2597aa5839ceb101 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -758,3 +758,34 @@ 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 29c6bda403026c3041c07ddfbae28b04b2116d51..48ebfe2a4b8e30e784dc5d64ac9e3526ebc90be8 100644 (file)
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -87,4 +87,10 @@ 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__ */