more MIDI paste improvements, plus move region-mute binding to PRIMARY-m and use...

[ardour.git] / gtk2_ardour / engine_dialog.cc

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 7d8f29cce46c3c5f2a11b27e2033c03fa4b97884..9c0a39c5547a27cc8de3fdf984434768542a58bc 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -5,7 +5,7 @@
 
 #include <glibmm.h>
 #include <gtkmm/messagedialog.h>
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
 
 #ifdef __APPLE__
 #include <CoreAudio/CoreAudio.h>
@@ -16,15 +16,15 @@
 #include <alsa/asoundlib.h>
 #endif
 
-#include <ardour/profile.h>
+#include "ardour/profile.h"
 #include <jack/jack.h>
 
 #include <gtkmm/stock.h>
 #include <gtkmm2ext/utils.h>
 
-#include <pbd/convert.h>
-#include <pbd/error.h>
-#include <pbd/pathscanner.h>
+#include "pbd/convert.h"
+#include "pbd/error.h"
+#include "pbd/pathscanner.h"
 
 #ifdef __APPLE
 #include <CFBundle.h>
@@ -218,6 +218,8 @@ EngineControl::EngineControl ()
        realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));
        realtime_changed ();
 
+#if PROVIDE_TOO_MANY_OPTIONS
+
 #ifndef __APPLE__
        label = manage (new Label (_("Realtime Priority")));
        label->set_alignment (1.0, 0.5);
@@ -262,6 +264,7 @@ EngineControl::EngineControl ()
        options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
        ++row;
 
+#endif /* PROVIDE_TOO_MANY_OPTIONS */
        label = manage (new Label (_("Number of ports")));
        label->set_alignment (1.0, 0.5);
        options_packer.attach (ports_spinner, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
@@ -375,10 +378,12 @@ EngineControl::build_command_line (vector<string>& cmd)
        if (str != _("Ignore")) {
                double secs = 0;
                uint32_t msecs;
-               atof (str);
+               secs = atof (str);
                msecs = (uint32_t) floor (secs * 1000.0);
-               cmd.push_back ("-t");
-               cmd.push_back (to_string (msecs, std::dec));
+               if (msecs > 0) {
+                       cmd.push_back ("-t");
+                       cmd.push_back (to_string (msecs, std::dec));
+               }
        }
 
        if (no_memory_lock_button.get_active()) {
@@ -925,7 +930,7 @@ EngineControl::audio_mode_changed ()
        }
 }
 
-static bool jack_server_filter(const string& str, void *arg)
+static bool jack_server_filter(const string& str, void */*arg*/)
 {
    return str == "jackd" || str == "jackdmp";
 }