Don't specify real-time priority when starting JACK (#4946).

git-svn-id: svn://localhost/ardour2/branches/3.0@12924 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 6fe514b99198db87f9d79a16bf02eb3a14082099..2db75d5dcbb8d8200545a7c073801e110bdc7e96 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -64,8 +64,6 @@ using namespace Glib;
 EngineControl::EngineControl ()
        : periods_adjustment (2, 2, 16, 1, 2),
          periods_spinner (periods_adjustment),
-         priority_adjustment (60, 10, 90, 1, 10),
-         priority_spinner (priority_adjustment),
          ports_adjustment (128, 8, 1024, 1, 16),
          ports_spinner (ports_adjustment),
          input_latency_adjustment (0, 0, 99999, 1),
@@ -249,19 +247,10 @@ EngineControl::EngineControl ()
        ++row;
 
        realtime_button.set_active (true);
-       realtime_button.signal_toggled().connect (sigc::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);
-       options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       options_packer.attach (priority_spinner, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-       ++row;
-       priority_spinner.set_value (60);
-
        options_packer.attach (no_memory_lock_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
        ++row;
        options_packer.attach (unlock_memory_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
@@ -422,8 +411,6 @@ EngineControl::build_command_line (vector<string>& cmd)
 
        if (realtime_button.get_active()) {
                cmd.push_back ("-R");
-               cmd.push_back ("-P");
-               cmd.push_back (to_string ((uint32_t) floor (priority_spinner.get_value()), std::dec));
        } else {
                cmd.push_back ("-r"); /* override jackd's default --realtime */
        }
@@ -650,14 +637,6 @@ EngineControl::setup_engine ()
        return 0;
 }
 
-void
-EngineControl::realtime_changed ()
-{
-#ifndef __APPLE__
-       priority_spinner.set_sensitive (realtime_button.get_active());
-#endif
-}
-
 void
 EngineControl::enumerate_devices (const string& driver)
 {
@@ -1106,10 +1085,6 @@ EngineControl::get_state ()
        child->add_property ("val", to_string (periods_adjustment.get_value(), std::dec));
        root->add_child_nocopy (*child);
 
-       child = new XMLNode ("priority");
-       child->add_property ("val", to_string (priority_adjustment.get_value(), std::dec));
-       root->add_child_nocopy (*child);
-
        child = new XMLNode ("ports");
        child->add_property ("val", to_string (ports_adjustment.get_value(), std::dec));
        root->add_child_nocopy (*child);
@@ -1256,9 +1231,6 @@ EngineControl::set_state (const XMLNode& root)
                if (child->name() == "periods") {
                        val = atoi (strval);
                        periods_adjustment.set_value(val);
-               } else if (child->name() == "priority") {
-                       val = atoi (strval);
-                       priority_adjustment.set_value(val);
                } else if (child->name() == "ports") {
                        val = atoi (strval);
                        ports_adjustment.set_value(val);

diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index 40384888f46efc0ac1e7b4aa91d3b7927175202c..da132cfb4602ee27206efd48101ae5f526e6bf1a 100644 (file)
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -49,8 +49,6 @@ class EngineControl : public Gtk::VBox {
   private:
        Gtk::Adjustment periods_adjustment;
        Gtk::SpinButton periods_spinner;
-       Gtk::Adjustment priority_adjustment;
-       Gtk::SpinButton priority_spinner;
        Gtk::Adjustment ports_adjustment;
        Gtk::SpinButton ports_spinner;
        Gtk::Adjustment input_latency_adjustment;
@@ -97,7 +95,6 @@ class EngineControl : public Gtk::VBox {
 
        bool _used;
 
-       void realtime_changed ();
        void driver_changed ();
        void build_command_line (std::vector<std::string>&);