ardour/livetrax
13
0
Fork 0
Code

fix control app breakage

Browse Source
This commit is contained in:
Paul Davis 2013-09-09 18:06:44 -04:00
parent 3633892eaa
commit 29c9d94dbe
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk2_ardour/engine_dialog.cc
View File

@ -792,19 +792,25 @@ EngineControl::get_device_name () const
void
EngineControl::control_app_button_clicked ()
{
const char* env_value = g_getenv ("ARDOUR_DEVICE_CONTROL_APP");
string appname;
const string appname = g_getenv ("ARDOUR_DEVICE_CONTROL_APP");
if (appname.empty()) {
cerr << "Environment var for control app: " << (env_value ? env_value : "empty") << endl;
if (!env_value) {
boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
if (!backend) {
return;
}
string appname = backend->control_app_name();
appname = backend->control_app_name();
} else {
appname = env_value;
}
cerr << "appname for control app " << appname << endl;
if (appname.empty()) {
return;
}
@ -827,7 +833,7 @@ EngineControl::manage_control_app_sensitivity ()
return;
}
string appname = backend->control_app_name();
appname = backend->control_app_name();
} else {
appname = env_value;
}

6
libs/backends/jack/jack_audiobackend.cc
View File

@ -959,11 +959,13 @@ JACKAudioBackend::control_app_name () const
{
string appname;
std::cerr << "td = " << _target_driver << " tdev = " << _target_device << std::endl;
if (_target_driver.empty() || _target_device.empty()) {
return appname;
}
if (_target_driver == "alsa") {
if (_target_driver == "ALSA") {
if (_target_device == "Hammerfall DSP") {
appname = "hdspconf";
@ -971,6 +973,8 @@ JACKAudioBackend::control_app_name () const
appname = "mudita";
}
}
std::cerr << "appname retrurned as " << appname << std::endl;
return appname;
}