From de4b24b162a2fccd6049d14eb092276fd2d4f849 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Fri, 9 Aug 2013 21:47:16 +1000 Subject: Move initialization of libardour from ARDOUR_UI class into main() --- gtk2_ardour/main.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gtk2_ardour/main.cc') diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 21e5343979..2e5d87b598 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -515,6 +515,11 @@ int main (int argc, char *argv[]) PBD::ID::init (); + if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) { + error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg; + exit (1); + } + if (::signal (SIGPIPE, sigpipe_handler)) { cerr << _("Cannot xinstall SIGPIPE error handler") << endl; } -- cgit v1.2.3 From 611058bf5863fd0d34362a20a9ce997092aeed23 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 10 Aug 2013 12:07:39 +1000 Subject: Remove call to PBD::ID::init as it is now done via ARDOUR::init --- gtk2_ardour/main.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'gtk2_ardour/main.cc') diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 2e5d87b598..84cd696af1 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -513,8 +513,6 @@ int main (int argc, char *argv[]) /* some GUI objects need this */ - PBD::ID::init (); - if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) { error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg; exit (1); -- cgit v1.2.3 From 7a431f892ec6e7e2283885c474b680081c983762 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 10 Aug 2013 12:08:45 +1000 Subject: Move curve test file handling in main() until after ARDOUR::init is called This means it doesn't need to call PBD::ID::init directly, which it now shouldn't be doing --- gtk2_ardour/curvetest.cc | 5 ----- gtk2_ardour/main.cc | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'gtk2_ardour/main.cc') diff --git a/gtk2_ardour/curvetest.cc b/gtk2_ardour/curvetest.cc index b3431e3f39..818a010f1d 100644 --- a/gtk2_ardour/curvetest.cc +++ b/gtk2_ardour/curvetest.cc @@ -32,11 +32,6 @@ using namespace PBD; int curvetest (string filename) { - // needed to initialize ID objects/counter used - // by Curve et al. - - PBD::ID::init (); - ifstream in (filename.c_str()); stringstream line; //Evoral::Parameter param(GainAutomation, -1.0, +1.0, 0.0); diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 84cd696af1..e619c9d83b 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -482,10 +482,6 @@ int main (int argc, char *argv[]) exit (1); } - if (curvetest_file) { - return curvetest (curvetest_file); - } - cout << PROGRAM_NAME << VERSIONSTRING << _(" (built using ") @@ -518,6 +514,10 @@ int main (int argc, char *argv[]) exit (1); } + if (curvetest_file) { + return curvetest (curvetest_file); + } + if (::signal (SIGPIPE, sigpipe_handler)) { cerr << _("Cannot xinstall SIGPIPE error handler") << endl; } -- cgit v1.2.3