remove incorrect merge of cairocanvas patch that stopped most tracks from displaying...

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 48aeb1aeb32d45908571323676f4128b41cb9432..645700a58bab98afe1a0dc96cb89860b3b8bb0b2 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -755,6 +755,7 @@ Editor::ensure_time_axis_view_is_visible (const TimeAxisView& tav)
 void
 Editor::tie_vertical_scrolling ()
 {
+
        _track_canvas_vadj->set_value (vertical_adjustment.get_value ());
 
        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 9934048d66e5fad0f22c880e741ffe815fdf4a70..065f6b711c20c6651b0a1474698cb70e82f5e4c2 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -28,6 +28,8 @@
 #include "ardour/track.h"
 #include "ardour/session.h"
 
+#include "pbd/compose.h"
+
 #include "canvas/rectangle.h"
 #include "canvas/debug.h"
 
@@ -63,13 +65,13 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_g
        , height(tv.height)
        , last_rec_data_frame(0)
 {
-       CANVAS_DEBUG_NAME (_background_group, "SV background group");
-       CANVAS_DEBUG_NAME (_canvas_group, "SV canvas group");
+       CANVAS_DEBUG_NAME (_background_group, string_compose ("SV background group %1", _trackview.name()));
+       CANVAS_DEBUG_NAME (_canvas_group, string_compose ("SV canvas group %1", _trackview.name()));
        
        /* set_position() will position the group */
 
        canvas_rect = new ArdourCanvas::Rectangle (_background_group);
-       CANVAS_DEBUG_NAME (canvas_rect, "SV canvas rectangle");
+       CANVAS_DEBUG_NAME (canvas_rect, string_compose ("SV canvas rectangle %1", _trackview.name()));
        canvas_rect->set (ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, tv.current_height ()));
        canvas_rect->raise(1); // raise above tempo lines
 

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 859cb1cba199ac86bc124ea71a866de23c4f591a..4408b88f8618d7680a811f7a0551d051b0b4a9f2 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -288,12 +288,6 @@ void
 TimeAxisView::clip_to_viewport ()
 {
        if (marked_for_display()) {
-               if (_y_position + _effective_height < _editor.get_trackview_group_vertical_offset () || 
-                   _y_position > _editor.get_trackview_group_vertical_offset () + _canvas_display->height()) {
-                       _canvas_background->hide ();
-                       _canvas_display->hide ();
-                       return;
-               }
                _canvas_background->show ();
                _canvas_display->show ();
        }

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index c675d7f570632da6177cae4fbebca45d69fbf379..4fd2b562f822f2544ec8a3d5fcc86c1d2a9d2af2 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -109,7 +109,7 @@ TimeAxisViewItem::TimeAxisViewItem(
        , _dragging (false)
 {
        group = new ArdourCanvas::Group (&parent);
-       CANVAS_DEBUG_NAME (group, "TAVI group");
+       CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", it_name));
 
        init (it_name, spu, base_color, start, duration, vis, true, true);
 }

diff --git a/libs/canvas/canvas/group.h b/libs/canvas/canvas/group.h
index 89d566b6ed32ec5c36e6e7a608e5f72b3384d013..ee50f649f3bd3049c126565ca52e69a6c92f8c37 100644 (file)
--- a/libs/canvas/canvas/group.h
+++ b/libs/canvas/canvas/group.h
@@ -26,7 +26,7 @@ public:
        std::list<Item*> const & items () const {
                return _items;
        }
-
+    
        void raise_child_to_top (Item *);
        void raise_child (Item *, int);
        void lower_child_to_bottom (Item *);

diff --git a/libs/canvas/canvas/item.h b/libs/canvas/canvas/item.h
index a440573731cf44a72c7f0867892b05ffa323b9fe..fc66754ed4ba20334cf29d69fee48b771f809f03 100644 (file)
--- a/libs/canvas/canvas/item.h
+++ b/libs/canvas/canvas/item.h
@@ -116,7 +116,7 @@ public:
        void raise (int);
        void lower_to_bottom ();
 
-       void hide ();
+        void hide ();
        void show ();
 
        /** @return true if this item is visible (ie it will be rendered),

diff --git a/libs/canvas/group.cc b/libs/canvas/group.cc
index a6ddec52bcc5430f882fabe7f198e437cbe8f718..7ed0f72f74b474e0e20a030306341e04ed12e94a 100644 (file)
--- a/libs/canvas/group.cc
+++ b/libs/canvas/group.cc
@@ -71,7 +71,7 @@ Group::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
                if (!(*i)->visible ()) {
 #ifdef CANVAS_DEBUG
                        if (DEBUG_ENABLED(PBD::DEBUG::CanvasRender)) {
-                               cerr << _canvas->render_indent() << "Item " << (*i)->whatami() << ' ' << (*i)->name << " invisible - skipped\n";
+                               cerr << _canvas->render_indent() << "Item " << (*i)->whatami() << " [" << (*i)->name << "] invisible - skipped\n";
                        }
 #endif
                        continue;
@@ -82,7 +82,7 @@ Group::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
                if (!item_bbox) {
 #ifdef CANVAS_DEBUG
                        if (DEBUG_ENABLED(PBD::DEBUG::CanvasRender)) {
-                               cerr << _canvas->render_indent() << "Item " << (*i)->whatami() << ' ' << (*i)->name << " empty - skipped\n";
+                               cerr << _canvas->render_indent() << "Item " << (*i)->whatami() << " [" << (*i)->name << "] empty - skipped\n";
                        }
 #endif
                        continue;
@@ -279,6 +279,7 @@ Group::dump (ostream& o) const
        o << _canvas->indent();
        o << "Group " << this;
        o << " Items: " << _items.size();
+       o << " Visible ? " << _visible;
 
        boost::optional<Rect> bb = bounding_box();