Mercurial > hg > svapp
comparison framework/MainWindowBase.cpp @ 658:94f518af106c single-point
Support reading OSC script from stdin; make it possible to run OSC script even without external OSC port
author | Chris Cannam |
---|---|
date | Thu, 28 Mar 2019 13:37:40 +0000 |
parents | 4f53620962d9 |
children | 49cf3787cf22 |
comparison
equal
deleted
inserted
replaced
657:029c224384d1 | 658:94f518af106c |
---|---|
511 std::min(size.height(), available.height())); | 511 std::min(size.height(), available.height())); |
512 resize(actual); | 512 resize(actual); |
513 } | 513 } |
514 | 514 |
515 void | 515 void |
516 MainWindowBase::startOSCQueue() | 516 MainWindowBase::startOSCQueue(bool withNetworkPort) |
517 { | 517 { |
518 m_oscQueueStarter = new OSCQueueStarter(this); | 518 m_oscQueueStarter = new OSCQueueStarter(this, withNetworkPort); |
519 connect(m_oscQueueStarter, SIGNAL(finished()), this, SLOT(oscReady())); | 519 connect(m_oscQueueStarter, SIGNAL(finished()), this, SLOT(oscReady())); |
520 m_oscQueueStarter->start(); | 520 m_oscQueueStarter->start(); |
521 } | 521 } |
522 | 522 |
523 void | 523 void |
526 if (m_oscQueue && m_oscQueue->isOK()) { | 526 if (m_oscQueue && m_oscQueue->isOK()) { |
527 connect(m_oscQueue, SIGNAL(messagesAvailable()), this, SLOT(pollOSC())); | 527 connect(m_oscQueue, SIGNAL(messagesAvailable()), this, SLOT(pollOSC())); |
528 QTimer *oscTimer = new QTimer(this); | 528 QTimer *oscTimer = new QTimer(this); |
529 connect(oscTimer, SIGNAL(timeout()), this, SLOT(pollOSC())); | 529 connect(oscTimer, SIGNAL(timeout()), this, SLOT(pollOSC())); |
530 oscTimer->start(1000); | 530 oscTimer->start(1000); |
531 SVCERR << "Finished setting up OSC interface" << endl; | 531 |
532 if (m_oscQueue->hasPort()) { | |
533 SVDEBUG << "Finished setting up OSC interface" << endl; | |
534 } else { | |
535 SVDEBUG << "Finished setting up internal-only OSC queue" << endl; | |
536 } | |
532 | 537 |
533 if (m_oscScriptFile != QString()) { | 538 if (m_oscScriptFile != QString()) { |
534 startOSCScript(); | 539 startOSCScript(); |
535 } | 540 } |
536 } | 541 } |