ardour/livetrax
13
0
Fork 0
Code

Move curve test file handling in main() until after ARDOUR::init is called

Browse Source 
This means it doesn't need to call PBD::ID::init directly, which it now
shouldn't be doing
This commit is contained in:
Tim Mayberry 2013-08-10 12:08:45 +10:00
parent 611058bf58
commit 7a431f892e
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/curvetest.cc
View File

@ -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);

8
gtk2_ardour/main.cc
View File

@ -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;
}