merge 12717:12954 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12955 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-06-28 13:30:03 +00:00
parent f1fd9c7bdc
commit 6e824e7797
174 changed files with 2923 additions and 2899 deletions

View file

@ -53,8 +53,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;
@ -163,7 +161,6 @@ class EngineControl : public Gtk::VBox {
bool _used;
void realtime_changed ();
void driver_changed ();
void interface_changed ();
void build_command_line (std::vector<std::string>&);