Fix glitching on "events" (like loop markers) due to taking the processing offset...

[ardour.git] / gtk2_ardour / pan_automation_time_axis.cc

diff --git a/gtk2_ardour/pan_automation_time_axis.cc b/gtk2_ardour/pan_automation_time_axis.cc
index bbd4b3b06c31a48ae6c845b45c85f0dc5f1ab8a6..e444e5dfea6c9807b6e4d90d63dde1517003995f 100644 (file)
--- a/gtk2_ardour/pan_automation_time_axis.cc
+++ b/gtk2_ardour/pan_automation_time_axis.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <ardour/curve.h>
@@ -52,7 +51,7 @@ PanAutomationTimeAxisView::~PanAutomationTimeAxisView ()
 }
 
 void
-PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, jack_nframes_t when, double y)
+PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, nframes_t when, double y)
 {
        if (lines.empty()) {
                /* no data, possibly caused by no outputs/inputs */
@@ -115,7 +114,7 @@ PanAutomationTimeAxisView::add_line (AutomationLine& line)
                multiline_selector.set_active(0);
        }
 
-       if (lines.size() + 1 > 1 && (height_style != Small && height_style != Smaller)) {
+       if (lines.size() + 1 > 1 && (height > hSmall)) {
                multiline_selector.show();
        } else {
                multiline_selector.hide();
@@ -126,21 +125,16 @@ PanAutomationTimeAxisView::add_line (AutomationLine& line)
 }
 
 void
-PanAutomationTimeAxisView::set_height (TimeAxisView::TrackHeight th)
+PanAutomationTimeAxisView::set_height (uint32_t h)
 {
-       AutomationTimeAxisView::set_height(th);
-
-       switch (th) {
-               case Largest:
-               case Large:
-               case Larger:
-               case Normal:
-                       if (lines.size() > 1) {
-                               multiline_selector.show();
-                               break;
-                       } 
-               default:
-                       multiline_selector.hide();
+       AutomationTimeAxisView::set_height(h);
+
+       if (h >= hNormal) {
+               if (lines.size() > 1) {
+                       multiline_selector.show();
+               } 
+       } else {
+               multiline_selector.hide();
        }
 }