ardour/livetrax
13
0
Fork 0
Code

Lua Session windows stdio

Browse Source 
Allow stdio, but do not open cmd.exe terminal when started.
This allows for scripted sessions.
This commit is contained in:
Robin Gareus 2021-06-09 02:43:03 +02:00
parent 0e570d15ae
commit 40e4a5a20d
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
luasession/luasession.cc
View File

@ -26,6 +26,7 @@
#include "pbd/reallocpool.h" #include "pbd/reallocpool.h"
#include "pbd/receiver.h" #include "pbd/receiver.h"
#include "pbd/transmitter.h" #include "pbd/transmitter.h"
#include "pbd/win_console.h"
#include "ardour/ardour.h" #include "ardour/ardour.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
@ -93,6 +94,7 @@ protected:
std::cout << prefix << str << std::endl; std::cout << prefix << str << std::endl;
if (chn == Transmitter::Fatal) { if (chn == Transmitter::Fatal) {
console_madness_end ();
::exit (9); ::exit (9);
} }
} }
@ -144,6 +146,7 @@ init ()
{ {
if (!ARDOUR::init (false, true, localedir)) { if (!ARDOUR::init (false, true, localedir)) {
cerr << "Ardour failed to initialize\n" << endl; cerr << "Ardour failed to initialize\n" << endl;
console_madness_end ();
::exit (EXIT_FAILURE); ::exit (EXIT_FAILURE);
} }
@ -394,6 +397,7 @@ engine_halted (const char* err)
{ {
if (terminate_when_halted) { if (terminate_when_halted) {
cerr << "Engine halted: " << err << "\n"; cerr << "Engine halted: " << err << "\n";
console_madness_end ();
::exit (EXIT_FAILURE); ::exit (EXIT_FAILURE);
} }
} }
@ -552,6 +556,7 @@ Ardour at your finger tips...\n\
\n"); \n");
printf ("Report bugs to <http://tracker.ardour.org/>\n" printf ("Report bugs to <http://tracker.ardour.org/>\n"
"Website: <http://ardour.org/>\n"); "Website: <http://ardour.org/>\n");
console_madness_end ();
::exit (EXIT_SUCCESS); ::exit (EXIT_SUCCESS);
} }
@ -568,6 +573,7 @@ main (int argc, char** argv)
}; };
bool interactive = false; bool interactive = false;
console_madness_begin ();
int c = 0; int c = 0;
while (EOF != (c = getopt_long (argc, argv, while (EOF != (c = getopt_long (argc, argv,
@ -584,6 +590,7 @@ main (int argc, char** argv)
case 'V': case 'V':
printf ("ardour-lua version %s\n\n", VERSIONSTRING); printf ("ardour-lua version %s\n\n", VERSIONSTRING);
printf ("Copyright (C) GPL 2015-2020 Robin Gareus <robin@gareus.org>\n"); printf ("Copyright (C) GPL 2015-2020 Robin Gareus <robin@gareus.org>\n");
console_madness_end ();
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);
break; break;
@ -593,6 +600,7 @@ main (int argc, char** argv)
default: default:
cerr << "Error: unrecognized option. See --help for usage information.\n"; cerr << "Error: unrecognized option. See --help for usage information.\n";
console_madness_end ();
::exit (EXIT_FAILURE); ::exit (EXIT_FAILURE);
break; break;
} }
@ -644,5 +652,6 @@ main (int argc, char** argv)
ARDOUR::cleanup (); ARDOUR::cleanup ();
delete event_loop; delete event_loop;
pthread_cancel_all (); pthread_cancel_all ();
console_madness_end ();
return res; return res;
} }

5
luasession/wscript
View File

@ -77,9 +77,8 @@ def build(bld):
obj.uselib += ' AUDIOUNITS OSX' obj.uselib += ' AUDIOUNITS OSX'
obj.use += ' libappleutility' obj.use += ' libappleutility'
#if bld.env['build_target'] == 'mingw': if bld.env['build_target'] == 'mingw':
# if bld.env['DEBUG'] == False: obj.linkflags = ['-mwindows']
# obj.linkflags = ['-mwindows']
if bld.is_defined('NEED_INTL'): if bld.is_defined('NEED_INTL'):
obj.linkflags = ' -lintl' obj.linkflags = ' -lintl'