ardour/livetrax
13
0
Fork 0
Code

Do not implicitly modify VST support config parameters

Browse Source
This commit is contained in:
Robin Gareus 2021-08-10 15:54:37 +02:00
parent 7c45502f46
commit 16da5419d3
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
14 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/canvas_test.cc
View File

@ -257,7 +257,7 @@ int main (int argc, char **argv)
// TODO setlocale.. // TODO setlocale..
#endif #endif
if (!ARDOUR::init (false, true, localedir)) { if (!ARDOUR::init (true, localedir)) {
cerr << "Ardour failed to initialize\n" << endl; cerr << "Ardour failed to initialize\n" << endl;
::exit (EXIT_FAILURE); ::exit (EXIT_FAILURE);
} }

2
gtk2_ardour/main.cc
View File

@ -383,7 +383,7 @@ int main (int argc, char *argv[])
SetErrorMode (prev_error_mode); SetErrorMode (prev_error_mode);
#endif #endif
if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir.c_str(), true)) { if (!ARDOUR::init (ARDOUR_COMMAND_LINE::try_hw_optimization, localedir.c_str(), true)) {
error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg; error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
Gtk::Main main (argc, argv); Gtk::Main main (argc, argv);
Gtk::MessageDialog msg (string_compose (_("Could not initialize %1 (likely due to corrupt config files).\n" Gtk::MessageDialog msg (string_compose (_("Could not initialize %1 (likely due to corrupt config files).\n"

2
gtk2_ardour/toolbar_test.cc
View File

@ -267,7 +267,7 @@ int main (int argc, char **argv)
// TODO setlocale.. // TODO setlocale..
#endif #endif
if (!ARDOUR::init (false, true, localedir)) { if (!ARDOUR::init (true, localedir)) {
cerr << "Ardour failed to initialize\n" << endl; cerr << "Ardour failed to initialize\n" << endl;
::exit (EXIT_FAILURE); ::exit (EXIT_FAILURE);
} }

12
headless/load_session.cc
View File

@ -149,7 +149,7 @@ print_help ()
int int
main (int argc, char* argv[]) main (int argc, char* argv[])
{ {
const char* optstring = "vhBdD:c:VOU:P"; const char* optstring = "vhBdD:c:OU:P";
/* clang-format off */ /* clang-format off */
const struct option longopts[] = { const struct option longopts[] = {
@ -159,14 +159,12 @@ main (int argc, char* argv[])
{ "disable-plugins", no_argument, 0, 'd' }, { "disable-plugins", no_argument, 0, 'd' },
{ "debug", required_argument, 0, 'D' }, { "debug", required_argument, 0, 'D' },
{ "name", required_argument, 0, 'c' }, { "name", required_argument, 0, 'c' },
{ "novst", no_argument, 0, 'V' },
{ "no-hw-optimizations", no_argument, 0, 'O' }, { "no-hw-optimizations", no_argument, 0, 'O' },
{ "no-connect-ports", no_argument, 0, 'P' }, { "no-connect-ports", no_argument, 0, 'P' },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
/* clang-format on */ /* clang-format on */
bool use_vst = true;
bool try_hw_optimization = true; bool try_hw_optimization = true;
backend_client_name = PBD::downcase (std::string (PROGRAM_NAME)); backend_client_name = PBD::downcase (std::string (PROGRAM_NAME));
@ -213,12 +211,6 @@ main (int argc, char* argv[])
ARDOUR::Port::set_connecting_blocked (true); ARDOUR::Port::set_connecting_blocked (true);
break; break;
case 'V':
#ifdef WINDOWS_VST_SUPPORT
use_vst = false;
#endif /* WINDOWS_VST_SUPPORT */
break;
default: default:
print_help (); print_help ();
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
@ -230,7 +222,7 @@ main (int argc, char* argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
if (!ARDOUR::init (use_vst, try_hw_optimization, localedir)) { if (!ARDOUR::init (try_hw_optimization, localedir)) {
cerr << "Ardour failed to initialize\n" cerr << "Ardour failed to initialize\n"
<< endl; << endl;
exit (EXIT_FAILURE); exit (EXIT_FAILURE);

3
libs/ardour/ardour/ardour.h
View File

@ -59,7 +59,6 @@ namespace ARDOUR {
extern LIBARDOUR_API std::map<std::string, bool> reserved_io_names; extern LIBARDOUR_API std::map<std::string, bool> reserved_io_names;
/** /**
* @param with_vst true to enable VST Support
* @param try_optimization true to enable hardware optimized routines * @param try_optimization true to enable hardware optimized routines
* for mixing, finding peak values etc. * for mixing, finding peak values etc.
* @param localedir Directory to look for localisation files * @param localedir Directory to look for localisation files
@ -68,7 +67,7 @@ namespace ARDOUR {
* *
* @return true if Ardour library was successfully initialized * @return true if Ardour library was successfully initialized
*/ */
LIBARDOUR_API bool init (bool with_vst, bool try_optimization, const char* localedir, bool with_gui = false); LIBARDOUR_API bool init (bool try_optimization, const char* localedir, bool with_gui = false);
LIBARDOUR_API void init_post_engine (uint32_t); LIBARDOUR_API void init_post_engine (uint32_t);
LIBARDOUR_API void cleanup (); LIBARDOUR_API void cleanup ();
LIBARDOUR_API bool no_auto_connect (); LIBARDOUR_API bool no_auto_connect ();

7
libs/ardour/globals.cc
View File

@ -518,7 +518,7 @@ ARDOUR::handle_old_configuration_files (boost::function<bool(std::string const&,
} }
bool bool
ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir, bool with_gui) ARDOUR::init (bool try_optimization, const char* localedir, bool with_gui)
{ {
if (libardour_initialized) { if (libardour_initialized) {
return true; return true;
@ -592,11 +592,6 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
return false; return false;
} }
Config->set_use_windows_vst (use_windows_vst);
#ifdef LXVST_SUPPORT
Config->set_use_lxvst (true);
#endif
Profile = new RuntimeProfile; Profile = new RuntimeProfile;
#ifdef WINDOWS_VST_SUPPORT #ifdef WINDOWS_VST_SUPPORT

2
libs/ardour/test/load_save_session.cc
View File

@ -44,7 +44,7 @@ int main (int argc, char* argv[])
PBD::Timing ardour_init_timing; PBD::Timing ardour_init_timing;
ARDOUR::init (false, true, localedir); ARDOUR::init (true, localedir);
ardour_init_timing.update(); ardour_init_timing.update();
TestUI* test_ui = new TestUI(); TestUI* test_ui = new TestUI();

2
libs/ardour/test/profiling/load_session.cc
View File

@ -19,7 +19,7 @@ int main (int argc, char* argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
ARDOUR::init (false, true, localedir); ARDOUR::init (true, localedir);
TestUI* test_ui = new TestUI(); TestUI* test_ui = new TestUI();
create_and_start_dummy_backend (); create_and_start_dummy_backend ();

2
libs/ardour/test/profiling/lots_of_regions.cc
View File

@ -16,7 +16,7 @@ static const char* localedir = LOCALEDIR;
int int
main (int argc, char* argv[]) main (int argc, char* argv[])
{ {
ARDOUR::init (false, true, localedir); ARDOUR::init (true, localedir);
TestUI* test_ui = new TestUI(); TestUI* test_ui = new TestUI();
create_and_start_dummy_backend (); create_and_start_dummy_backend ();
Session* session = load_session ("../libs/ardour/test/profiling/sessions/1region", "1region"); Session* session = load_session ("../libs/ardour/test/profiling/sessions/1region", "1region");

2
libs/ardour/test/profiling/runpc.cc
View File

@ -21,7 +21,7 @@ main (int argc, char* argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
ARDOUR::init (false, true, localedir); ARDOUR::init (true, localedir);
TestUI* test_ui = new TestUI(); TestUI* test_ui = new TestUI();
create_and_start_dummy_backend (); create_and_start_dummy_backend ();

5
libs/ardour/test/test_ui.cc
View File

@ -46,11 +46,6 @@ TestUI::TestUI ()
m_test_receiver.listen_to (PBD::warning); m_test_receiver.listen_to (PBD::warning);
m_test_receiver.listen_to (PBD::error); m_test_receiver.listen_to (PBD::error);
m_test_receiver.listen_to (PBD::fatal); m_test_receiver.listen_to (PBD::fatal);
/* We can't use VSTs here as we have a stub instead of the
required bits in gtk2_ardour.
*/
Config->set_use_lxvst (false);
} }
TestUI::~TestUI () TestUI::~TestUI ()

2
libs/ardour/test/testrunner.cc
View File

@ -49,7 +49,7 @@ main(int argc, char* argv[])
} }
} }
CPPUNIT_ASSERT (ARDOUR::init (false, true, localedir)); CPPUNIT_ASSERT (ARDOUR::init (true, localedir));
TestUI* test_ui = new TestUI(); TestUI* test_ui = new TestUI();

2
luasession/luasession.cc
View File

@ -144,7 +144,7 @@ static MyEventLoop* event_loop = NULL;
static void static void
init () init ()
{ {
if (!ARDOUR::init (false, true, localedir)) { if (!ARDOUR::init (true, localedir)) {
cerr << "Ardour failed to initialize\n" << endl; cerr << "Ardour failed to initialize\n" << endl;
console_madness_end (); console_madness_end ();
::exit (EXIT_FAILURE); ::exit (EXIT_FAILURE);

2
session_utils/common.cc
View File

@ -114,7 +114,7 @@ static MyEventLoop *event_loop;
void void
SessionUtils::init (bool print_log) SessionUtils::init (bool print_log)
{ {
if (!ARDOUR::init (false, true, localedir)) { if (!ARDOUR::init (true, localedir)) {
cerr << "Ardour failed to initialize\n" << endl; cerr << "Ardour failed to initialize\n" << endl;
::exit (EXIT_FAILURE); ::exit (EXIT_FAILURE);
} }