cleanup a couple of audio file format names as reported by libsndfile

[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 ec884151b5d46653fb5161888ab996d92af061a7..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 */
@@ -92,7 +91,7 @@ PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEv
        XMLNode &before = alist.get_state();
        alist.add (when, y);
        XMLNode &after = alist.get_state();
-        _session.add_command(new MementoCommand<AutomationList>(alist, before, after));
+        _session.add_command(new MementoCommand<AutomationList>(alist, &before, &after));
        _session.commit_reversible_command ();
        _session.set_dirty ();
 }
@@ -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();
        }
 }