mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-01 11:27:45 +01:00
improve the user experience when starting up 3.0-SG with SG as the driver
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13385 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
7b995e773e
commit
2659be95c5
4 changed files with 108 additions and 22 deletions
|
|
@ -670,11 +670,28 @@ EngineControl::engine_running ()
|
|||
return false;
|
||||
}
|
||||
|
||||
int
|
||||
EngineControl::prepare ()
|
||||
{
|
||||
string driver = driver_combo.get_active_text();
|
||||
|
||||
if (driver == "SoundGrid") {
|
||||
return soundgrid_init (inputs_adjustment.get_value(), outputs_adjustment.get_value(),
|
||||
16, /* max tracks */
|
||||
16, /* max busses */
|
||||
8 /* max plugins per track */
|
||||
);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
EngineControl::setup_engine ()
|
||||
{
|
||||
vector<string> args;
|
||||
std::string cwd = "/tmp";
|
||||
string driver = driver_combo.get_active_text();
|
||||
|
||||
build_command_line (args);
|
||||
|
||||
|
|
@ -699,7 +716,6 @@ EngineControl::setup_engine ()
|
|||
jackdrc << endl;
|
||||
jackdrc.close ();
|
||||
|
||||
string driver = driver_combo.get_active_text();
|
||||
if (driver == "SoundGrid") {
|
||||
soundgrid_configure ();
|
||||
}
|
||||
|
|
@ -721,13 +737,7 @@ EngineControl::enumerate_devices (const string& driver)
|
|||
} else if (driver == "CoreAudio") {
|
||||
devices[driver] = enumerate_coreaudio_devices ();
|
||||
} else if (driver == "SoundGrid") {
|
||||
|
||||
soundgrid_init (inputs_adjustment.get_value(), outputs_adjustment.get_value(),
|
||||
16, /* max tracks */
|
||||
16, /* max busses */
|
||||
8 /* max plugins per track */
|
||||
);
|
||||
devices[driver] = SoundGrid::lan_port_names();
|
||||
devices[driver].clear ();
|
||||
|
||||
#else
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue