#include <fstream>
#include <map>
+#include <boost/scoped_ptr.hpp>
+
#include <glibmm.h>
#include <gtkmm/messagedialog.h>
+
+#include "pbd/epa.h"
#include "pbd/xml++.h"
#ifdef __APPLE__
priority_spinner (priority_adjustment),
ports_adjustment (128, 8, 1024, 1, 16),
ports_spinner (ports_adjustment),
+ input_latency_adjustment (0, 0, 99999, 1),
+ input_latency (input_latency_adjustment),
+ output_latency_adjustment (0, 0, 99999, 1),
+ output_latency (output_latency_adjustment),
realtime_button (_("Realtime")),
no_memory_lock_button (_("Do not lock memory")),
unlock_memory_button (_("Unlock memory")),
#else
strings.push_back (X_("ALSA"));
strings.push_back (X_("OSS"));
+ strings.push_back (X_("FreeBoB"));
strings.push_back (X_("FFADO"));
#endif
strings.push_back (X_("NetJACK"));
{
string str;
string driver;
- bool using_oss = false;
bool using_alsa = false;
bool using_coreaudio = false;
- bool using_netjack = false;
- bool using_ffado = false;
bool using_dummy = false;
+ bool using_ffado = false;
/* first, path to jackd */
/* now jackd arguments */
str = timeout_combo.get_active_text ();
+
if (str != _("Ignore")) {
+
double secs = 0;
uint32_t msecs;
secs = atof (str);
msecs = (uint32_t) floor (secs * 1000.0);
+
if (msecs > 0) {
cmd.push_back ("-t");
cmd.push_back (to_string (msecs, std::dec));
cmd.push_back ("-d");
driver = driver_combo.get_active_text ();
+
if (driver == X_("ALSA")) {
using_alsa = true;
cmd.push_back ("alsa");
} else if (driver == X_("OSS")) {
- using_oss = true;
cmd.push_back ("oss");
} else if (driver == X_("CoreAudio")) {
using_coreaudio = true;
cmd.push_back ("coreaudio");
} else if (driver == X_("NetJACK")) {
- using_netjack = true;
cmd.push_back ("netjack");
+ } else if (driver == X_("FreeBoB")) {
+ cmd.push_back ("freebob");
} else if (driver == X_("FFADO")) {
using_ffado = true;
-
- /* do this until FFADO becomes the standard */
-
- char* hack = getenv ("ARDOUR_FIREWIRE_DRIVER_NAME");
-
- if (hack) {
- cmd.push_back (hack);
- } else {
- cmd.push_back ("freebob");
- }
-
+ cmd.push_back ("firewire");
} else if ( driver == X_("Dummy")) {
using_dummy = true;
cmd.push_back ("dummy");
cmd.push_back ("-C");
cmd.push_back (input_device);
+
cmd.push_back ("-P");
cmd.push_back (output_device);
cmd.push_back ("-C");
}
- if (! using_dummy ) {
+ if (!using_dummy) {
cmd.push_back ("-n");
cmd.push_back (to_string ((uint32_t) floor (periods_spinner.get_value()), std::dec));
}
cmd.push_back ("-p");
cmd.push_back (period_size_combo.get_active_text());
+
+ if (using_alsa || using_ffado || using_coreaudio) {
+
+ double val = input_latency_adjustment.get_value();
+
+ if (val) {
+ cmd.push_back ("-I");
+ cmd.push_back (to_string ((uint32_t) val, std::dec));
+ }
+
+ val = output_latency_adjustment.get_value();
+
+ if (val) {
+ cmd.push_back ("-O");
+ cmd.push_back (to_string ((uint32_t) val, std::dec));
+ }
+ }
if (using_alsa) {
} else if (str == _("raw")) {
cmd.push_back ("-X raw");
}
-
} else if (using_coreaudio) {
#ifdef __APPLE__
cmd.push_back (device);
#endif
- } else if (using_oss) {
-
- } else if (using_netjack) {
-
}
}
bool
EngineControl::engine_running ()
{
+ EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
+ boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
+
+ /* revert all environment settings back to whatever they were when ardour started
+ */
+
+ if (global_epa) {
+ current_epa.reset (new EnvironmentalProtectionAgency(true)); /* will restore settings when we leave scope */
+ global_epa->restore ();
+ }
+
jack_status_t status;
jack_client_t* c = jack_client_open ("ardourprobe", JackNoStartServer, &status);
return 1; // try again
}
- Glib::ustring jackdrc_path = Glib::get_home_dir();
+ std::string jackdrc_path = Glib::get_home_dir();
jackdrc_path += "/.jackdrc";
ofstream jackdrc (jackdrc_path.c_str());
#ifndef __APPLE__
} else if (driver == "ALSA") {
devices[driver] = enumerate_alsa_devices ();
+ } else if (driver == "FreeBOB") {
+ devices[driver] = enumerate_freebob_devices ();
} else if (driver == "FFADO") {
devices[driver] = enumerate_ffado_devices ();
} else if (driver == "OSS") {
vector<string> devs;
return devs;
}
+
vector<string>
EngineControl::enumerate_oss_devices ()
{
vector<string>& strings = devices[driver];
- if (strings.empty() && driver != "FFADO" && driver != "Dummy") {
+ if (strings.empty() && driver != "FreeBoB" && driver != "FFADO" && driver != "Dummy") {
error << string_compose (_("No devices found for driver \"%1\""), driver) << endmsg;
return;
}
void
EngineControl::audio_mode_changed ()
{
- Glib::ustring str = audio_mode_combo.get_active_text();
+ std::string str = audio_mode_combo.get_active_text();
if (str == _("Playback/Recording on 1 Device")) {
input_device_combo.set_sensitive (false);
{
XMLNode* root = new XMLNode ("AudioSetup");
XMLNode* child;
- Glib::ustring path;
+ std::string path;
child = new XMLNode ("periods");
child->add_property ("val", to_string (periods_adjustment.get_value(), std::dec));
XMLNode* child;
XMLProperty* prop = NULL;
bool using_dummy = false;
+ bool using_ffado = false;
int val;
string strval;
if ( (child = root.child ("driver"))){
prop = child->property("val");
+
if (prop && (prop->value() == "Dummy") ) {
using_dummy = true;
}
+ if (prop && (prop->value() == "FFADO") ) {
+ using_ffado = true;
+ }
+
}
clist = root.children();
if (!prop || prop->value().empty()) {
- if ((using_dummy && ( child->name() == "interface" || child->name() == "inputdevice" || child->name() == "outputdevice" )) ||
- child->name() == "timeout")
+ if (((using_dummy || using_ffado)
+ && ( child->name() == "interface"
+ || child->name() == "inputdevice"
+ || child->name() == "outputdevice"))
+ || child->name() == "timeout")
+ {
continue;
+ }
+
error << string_compose (_("AudioSetup value for %1 is missing data"), child->name()) << endmsg;
continue;
}
projects / ardour.git / blobdiff