comparison main/main.cpp @ 642:e3a4831f9c64 imaf_enc

Merge from the default branch
author Chris Cannam
date Tue, 05 Nov 2013 11:17:35 +0000
parents 6d8a76bd91a7
children 86d1f640ae1e
comparison
equal deleted inserted replaced
637:f45af8d8091e 642:e3a4831f9c64
255 QStringList args = application.arguments(); 255 QStringList args = application.arguments();
256 256
257 signal(SIGINT, signalHandler); 257 signal(SIGINT, signalHandler);
258 signal(SIGTERM, signalHandler); 258 signal(SIGTERM, signalHandler);
259 259
260 #ifndef Q_WS_WIN32 260 #ifndef Q_OS_WIN32
261 signal(SIGHUP, signalHandler); 261 signal(SIGHUP, signalHandler);
262 signal(SIGQUIT, signalHandler); 262 signal(SIGQUIT, signalHandler);
263 #endif 263 #endif
264 264
265 bool audioOutput = true; 265 bool audioOutput = true;