fix control app breakage

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index cbda83c347e6ccc62f625aabd20dfe3c46efee0c..c55fc7008baaafe90cf3bc989a90775f97ee58d6 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -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;
        }

diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index 27f8a4f0c62e004bd7d9ac683ad3386628df165d..3cbd0cd6ae379066c0b73e5dac8e685c6d09a4f2 100644 (file)
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -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;
 }