diff options
author | Tim E. Real <termtech@rogers.com> | 2011-04-14 23:13:03 +0000 |
---|---|---|
committer | Tim E. Real <termtech@rogers.com> | 2011-04-14 23:13:03 +0000 |
commit | 8acbc05a692368347cffa794d047dc4839ad6b78 (patch) | |
tree | 746224e249a57b11ff4cbbce8726a407693bdcd8 /muse2/muse/osc.cpp | |
parent | 1d3741efd41bdcde88f05b210ebae218acc6967d (diff) |
Fix arranger midi part event 'sliver' drawing. Fix partname drawing.
Remove dssi gui killtimers causing error.
Diffstat (limited to 'muse2/muse/osc.cpp')
-rw-r--r-- | muse2/muse/osc.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/muse2/muse/osc.cpp b/muse2/muse/osc.cpp index 2b567856..66242e17 100644 --- a/muse2/muse/osc.cpp +++ b/muse2/muse/osc.cpp @@ -504,7 +504,13 @@ OscIF::~OscIF() // process needs to do all its cleanup: use a higher value if the process is likely to do a lot of // computation or I/O on cleanup." _oscGuiQProc->terminate(); - QTimer::singleShot( 5000, _oscGuiQProc, SLOT( kill() ) ); + // FIXME: In Qt4 this can only be used with threads started with QThread. + // Kill is bad anyway, app should check at close if all these guis closed or not + // and ask user if they really want to close, possibly with kill. + // Terminate might not terminate the thread. It is given a chance to prompt for saving etc. + // so kill is not desirable. + // We could wait until terminate finished but don't think that's good here. + ///QTimer::singleShot( 5000, _oscGuiQProc, SLOT( kill() ) ); } //delete _oscGuiQProc; } @@ -710,7 +716,13 @@ int OscIF::oscExiting(lo_arg**) // process needs to do all its cleanup: use a higher value if the process is likely to do a lot of // computation or I/O on cleanup." _oscGuiQProc->terminate(); - QTimer::singleShot( 5000, _oscGuiQProc, SLOT( kill() ) ); + // FIXME: In Qt4 this can only be used with threads started with QThread. + // Kill is bad anyway, app should check at close if all these guis closed or not + // and ask user if they really want to close, possibly with kill. + // Terminate might not terminate the thread. It is given a chance to prompt for saving etc. + // so kill is not desirable. + // We could wait until terminate finished but don't think that's good here. + ///QTimer::singleShot( 5000, _oscGuiQProc, SLOT( kill() ) ); } //delete _oscGuiQProc; } @@ -928,7 +940,8 @@ bool OscIF::oscInitGui(const QString& typ, const QString& baseName, const QStrin //{ // No QProcess created yet? Do it now. Only once per SynthIF instance. Exists until parent destroyed. if(_oscGuiQProc == 0) - _oscGuiQProc = new QProcess(muse); + //_oscGuiQProc = new QProcess(muse); + _oscGuiQProc = new QProcess(); //QString program(fi.filePath()); QString program(guiPath); |