Mercurial > hg > piper-cpp
changeset 111:d74dfc11927c
OSX build fixes and logic
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Tue, 25 Oct 2016 14:48:56 +0100 |
| parents | 535ee33eb8b3 |
| children | b418b583fd3b |
| files | vamp-client/AutoPlugin.h vamp-client/CapnpRRClient.h vamp-client/ProcessQtTransport.h |
| diffstat | 3 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/vamp-client/AutoPlugin.h Mon Oct 24 17:54:37 2016 +0100 +++ b/vamp-client/AutoPlugin.h Tue Oct 25 14:48:56 2016 +0100 @@ -1,3 +1,4 @@ +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ #ifndef PIPER_AUTO_PLUGIN_H #define PIPER_AUTO_PLUGIN_H
--- a/vamp-client/CapnpRRClient.h Mon Oct 24 17:54:37 2016 +0100 +++ b/vamp-client/CapnpRRClient.h Tue Oct 25 14:48:56 2016 +0100 @@ -1,3 +1,4 @@ +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ #ifndef PIPER_CAPNP_CLIENT_H #define PIPER_CAPNP_CLIENT_H @@ -286,7 +287,8 @@ if (r.getResponse().which() != type) { std::cerr << "checkResponseType: wrong response type (received " - << r.getResponse().which() << ", expected " << type << ")" + << int(r.getResponse().which()) << ", expected " + << int(type) << ")" << std::endl; throw std::runtime_error("Wrong response type"); }
--- a/vamp-client/ProcessQtTransport.h Mon Oct 24 17:54:37 2016 +0100 +++ b/vamp-client/ProcessQtTransport.h Tue Oct 25 14:48:56 2016 +0100 @@ -1,4 +1,5 @@ - +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ + #ifndef PIPER_PROCESS_QT_TRANSPORT_H #define PIPER_PROCESS_QT_TRANSPORT_H @@ -31,7 +32,18 @@ m_process->setProcessChannelMode(QProcess::ForwardedErrorChannel); m_process->start(QString::fromStdString(processName)); if (!m_process->waitForStarted()) { - std::cerr << "server failed to start" << std::endl; + QProcess::ProcessError err = m_process->error(); + if (err == QProcess::FailedToStart) { + std::cerr << "Unable to start server process " << processName + << std::endl; + } else if (err == QProcess::Crashed) { + std::cerr << "Server process " << processName + << " crashed on startup" << std::endl; + } else { + std::cerr << "Server process " << processName + << " failed on startup with error code " + << err << std::endl; + } delete m_process; m_process = nullptr; } @@ -51,7 +63,7 @@ } void - setCompletenessChecker(MessageCompletenessChecker *checker) { + setCompletenessChecker(MessageCompletenessChecker *checker) override { //!!! ownership? m_completenessChecker = checker; }