diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-04 21:57:45 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-04 21:57:45 +0000 |
| commit | 3ce593374063f0d9a7ad72503c09ed11a67278dc (patch) | |
| tree | c632aa66fd518b8e2ae5af1147b0b0cb9627694d | |
| parent | 6a3c8427c6f38e50a89c633319af330aa0146554 (diff) | |
more canvas-height related fixes; likely fix for loading VST plugins by name instead of unique ID
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3006 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 20 | ||||
| -rw-r--r-- | libs/ardour/plugin.cc | 13 |
2 files changed, 23 insertions, 10 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 1e3c94c223..a5922fc515 100644 --- 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 07afcbba51..d8616eabde 100644 --- 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); } |