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(-) 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