X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fengine_dialog.cc;h=9c0a39c5547a27cc8de3fdf984434768542a58bc;hb=e57c4d4c43c0d302c0b06128e0ba10c4683ee8fe;hp=7d8f29cce46c3c5f2a11b27e2033c03fa4b97884;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 7d8f29cce4..9c0a39c554 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -5,7 +5,7 @@ #include #include -#include +#include "pbd/xml++.h" #ifdef __APPLE__ #include @@ -16,15 +16,15 @@ #include #endif -#include +#include "ardour/profile.h" #include #include #include -#include -#include -#include +#include "pbd/convert.h" +#include "pbd/error.h" +#include "pbd/pathscanner.h" #ifdef __APPLE #include @@ -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& 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"; }