abort if configuration fails

[ardour.git] / libs / ardour / parameter_descriptor.cc

diff --git a/libs/ardour/parameter_descriptor.cc b/libs/ardour/parameter_descriptor.cc
index 3863e9fdb6895c7df879612ecaae3c317d58666b..9fb6b89a0c5548c0ae7aca654d7aab3c7db14a71 100644 (file)
--- a/libs/ardour/parameter_descriptor.cc
+++ b/libs/ardour/parameter_descriptor.cc
@@ -112,11 +112,6 @@ ParameterDescriptor::ParameterDescriptor(const Evoral::Parameter& parameter)
                integer_step = true;
                lower = MonitorAuto;
                upper = MonitorDisk; /* XXX bump when we add MonitorCue */
-               scale_points.reset (new ScalePoints);
-               scale_points->insert (std::make_pair (_("Auto"), (float) MonitorAuto));
-               scale_points->insert (std::make_pair (_("Input"), (float) MonitorInput));
-               scale_points->insert (std::make_pair (_("Disk"), (float) MonitorDisk));
-               // scale_points->insert (std::make_pair (_("Cue"), (float) MonitorCue));
                break;
        case SoloIsolateAutomation:
                toggled = true;
@@ -183,8 +178,8 @@ ParameterDescriptor::update_steps()
                        largestep = largestep / logf(30.0f);
                } else if (integer_step) {
                        smallstep = 1.0;
-                       step      = std::max(1.0, rint(step));
-                       largestep = std::max(1.0, rint(largestep));
+                       step      = std::max(1.f, rintf (step));
+                       largestep = std::max(1.f, rintf (largestep));
                }
        }
 }