ardour/livetrax
13
0
Fork 0
Code

use backend_client_name parsed from options when initializing backend

Browse Source
This commit is contained in:
Matthijs van Otterdijk 2022-03-01 02:35:27 +01:00
parent 50abcc74b5
commit 3050fe24e5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/engine_dialog.cc
View File

@ -1089,7 +1089,7 @@ EngineControl::backend_changed ()
string backend_name = backend_combo.get_active_text(); string backend_name = backend_combo.get_active_text();
boost::shared_ptr<ARDOUR::AudioBackend> backend; boost::shared_ptr<ARDOUR::AudioBackend> backend;
if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, downcase (std::string(PROGRAM_NAME)), ""))) { if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, ARDOUR_COMMAND_LINE::backend_client_name, ""))) {
/* eh? setting the backend failed... how ? */ /* eh? setting the backend failed... how ? */
/* A: stale config contains a backend that does not exist in current build */ /* A: stale config contains a backend that does not exist in current build */
return; return;
@ -2259,7 +2259,7 @@ EngineControl::set_current_state (const State& state)
boost::shared_ptr<ARDOUR::AudioBackend> backend; boost::shared_ptr<ARDOUR::AudioBackend> backend;
if (!(backend = ARDOUR::AudioEngine::instance ()->set_backend (state->backend, downcase (std::string (PROGRAM_NAME)), ""))) { if (!(backend = ARDOUR::AudioEngine::instance ()->set_backend (state->backend, ARDOUR_COMMAND_LINE::backend_client_name, ""))) {
DEBUG_ECONTROL (string_compose ("Unable to set backend to %1", state->backend)); DEBUG_ECONTROL (string_compose ("Unable to set backend to %1", state->backend));
// this shouldn't happen as the invalid backend names should have been // this shouldn't happen as the invalid backend names should have been
// removed from the list of states. // removed from the list of states.

2
gtk2_ardour/opts.cc
View File

@ -41,7 +41,7 @@
using namespace std; using namespace std;
string ARDOUR_COMMAND_LINE::session_name = ""; string ARDOUR_COMMAND_LINE::session_name = "";
string ARDOUR_COMMAND_LINE::backend_client_name = "ardour"; string ARDOUR_COMMAND_LINE::backend_client_name = PBD::downcase(PROGRAM_NAME);
bool ARDOUR_COMMAND_LINE::show_key_actions = false; bool ARDOUR_COMMAND_LINE::show_key_actions = false;
bool ARDOUR_COMMAND_LINE::show_actions = false; bool ARDOUR_COMMAND_LINE::show_actions = false;
bool ARDOUR_COMMAND_LINE::no_splash = false; bool ARDOUR_COMMAND_LINE::no_splash = false;