smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 09:06:33 +01:00
Code Issues Projects Releases Wiki Activity

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
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/engine_dialog.cc
View file

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

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

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