more canvas-height related fixes; likely fix for loading VST plugins by name instead...

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

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 1e3c94c2235be929fbfc8e1f6b566118bc8f1c1b..a5922fc5157dc906f39e645efa0a91450ee49411 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -325,15 +325,15 @@ Editor::track_canvas_size_allocated ()
        }
 
        range_marker_drag_rect->property_y1() = y1;
-       range_marker_drag_rect->property_y2() = y1 + canvas_height;
+       range_marker_drag_rect->property_y2() = full_canvas_height;
        transport_loop_range_rect->property_y1() = y1;
-       transport_loop_range_rect->property_y2() = y1 + canvas_height;
+       transport_loop_range_rect->property_y2() = full_canvas_height;
        transport_punch_range_rect->property_y1() = y1;
-       transport_punch_range_rect->property_y2() = y1 + canvas_height;
+       transport_punch_range_rect->property_y2() = full_canvas_height;
        transport_punchin_line->property_y1() = y1;
-       transport_punchin_line->property_y2() = y1 + canvas_height;
+       transport_punchin_line->property_y2() = full_canvas_height;
        transport_punchout_line->property_y1() = y1;
-       transport_punchout_line->property_y2() = y1 + canvas_height;
+       transport_punchout_line->property_y2() = full_canvas_height;
        
        update_fixed_rulers();
        redisplay_tempo (true);
@@ -694,15 +694,15 @@ Editor::tie_vertical_scrolling ()
        playhead_cursor->set_y_axis (y1);
 
        range_marker_drag_rect->property_y1() = y1;
-       range_marker_drag_rect->property_y2() = y1 + canvas_height;
+       range_marker_drag_rect->property_y2() = full_canvas_height;
        transport_loop_range_rect->property_y1() = y1;
-       transport_loop_range_rect->property_y2() = y1 + canvas_height;
+       transport_loop_range_rect->property_y2() = full_canvas_height;
        transport_punch_range_rect->property_y1() = y1;
-       transport_punch_range_rect->property_y2() = y1 + canvas_height;
+       transport_punch_range_rect->property_y2() = full_canvas_height;
        transport_punchin_line->property_y1() = y1;
-       transport_punchin_line->property_y2() = y1 + canvas_height;
+       transport_punchin_line->property_y2() = full_canvas_height;
        transport_punchout_line->property_y1() = y1;
-       transport_punchout_line->property_y2() = y1 + canvas_height;
+       transport_punchout_line->property_y2() = full_canvas_height;
 
        if (!selection->markers.empty()) {
                for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {            

diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index 07afcbba511b4d940c5c93438eb0f716cfb84cc0..d8616eabde6d7c6a55637ca8dfe4ed161f90545f 100644 (file)
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -348,6 +348,19 @@ ARDOUR::find_plugin(Session& session, string identifier, PluginType type)
                        return (*i)->load (session);
                }
        }
+
+#ifdef VST_SUPPORT
+       /* hmm, we didn't find it. could be because in older versions of Ardour.
+          we used to store the name of a VST plugin, not its unique ID. so try
+          again.
+       */
+
+       for (i = plugs.begin(); i != plugs.end(); ++i) {
+               if (identifier == (*i)->name){
+                       return (*i)->load (session);
+               }
+       }
+#endif
        
        return PluginPtr ((Plugin*) 0);
 }