smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12924 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-06-25 14:41:03 +00:00
parent 97d920593f
commit c7ebac12b1
2 changed files with 0 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gtk2_ardour/engine_dialog.cc
View file

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

3
gtk2_ardour/engine_dialog.h
View file

@ -49,8 +49,6 @@ class EngineControl : public Gtk::VBox {
private: private:
Gtk::Adjustment periods_adjustment; Gtk::Adjustment periods_adjustment;
Gtk::SpinButton periods_spinner; Gtk::SpinButton periods_spinner;
Gtk::Adjustment priority_adjustment;
Gtk::SpinButton priority_spinner;
Gtk::Adjustment ports_adjustment; Gtk::Adjustment ports_adjustment;
Gtk::SpinButton ports_spinner; Gtk::SpinButton ports_spinner;
Gtk::Adjustment input_latency_adjustment; Gtk::Adjustment input_latency_adjustment;
@ -97,7 +95,6 @@ class EngineControl : public Gtk::VBox {
bool _used; bool _used;
void realtime_changed ();
void driver_changed (); void driver_changed ();
void build_command_line (std::vector<std::string>&); void build_command_line (std::vector<std::string>&);