ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Patch from mantis user 'lincoln'; add support for FreeBoB in the audio settings, and pass the correct flag to JACK for using FFADO.

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@2562 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2007-10-19 13:58:48 +00:00
parent 77f16522e0
commit a29a10c02a
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/engine_dialog.cc
View File

@ -113,6 +113,7 @@ EngineControl::EngineControl ()
strings.push_back (X_("ALSA"));
strings.push_back (X_("OSS"));
strings.push_back (X_("FFADO"));
strings.push_back (X_("FreeBoB"));
#endif
strings.push_back (X_("NetJACK"));
strings.push_back (X_("Dummy"));
@ -363,6 +364,7 @@ EngineControl::build_command_line (vector<string>& cmd)
bool using_coreaudio = false;
bool using_netjack = false;
bool using_ffado = false;
bool using_freebob = false;
/* first, path to jackd */
@ -424,7 +426,10 @@ EngineControl::build_command_line (vector<string>& cmd)
cmd.push_back ("netjack");
} else if (driver == X_("FFADO")) {
using_ffado = true;
cmd.push_back ("ffado");
cmd.push_back ("firewire");
} else if (driver == X_("FreeBoB")) {
using_freebob = true;
cmd.push_back ("freebob");
}
/* driver arguments */
@ -567,6 +572,7 @@ EngineControl::enumerate_devices ()
#else
devices["ALSA"] = enumerate_alsa_devices ();
devices["FFADO"] = enumerate_ffado_devices ();
devices["FreeBoB"] = enumerate_freebob_devices ();
devices["OSS"] = enumerate_oss_devices ();
devices["Dummy"] = enumerate_dummy_devices ();
devices["NetJACK"] = enumerate_netjack_devices ();
@ -712,6 +718,12 @@ EngineControl::enumerate_ffado_devices ()
return devs;
}
vector<string>
EngineControl::enumerate_freebob_devices ()
{
vector<string> devs;
return devs;
}
vector<string>
EngineControl::enumerate_oss_devices ()
{
vector<string> devs;

1
gtk2_ardour/engine_dialog.h
View File

@ -91,6 +91,7 @@ class EngineControl : public Gtk::VBox {
std::vector<std::string> enumerate_alsa_devices ();
std::vector<std::string> enumerate_oss_devices ();
std::vector<std::string> enumerate_netjack_devices ();
std::vector<std::string> enumerate_freebob_devices ();
std::vector<std::string> enumerate_ffado_devices ();
std::vector<std::string> enumerate_dummy_devices ();
#endif