Mercurial > hg > piper-cpp
changeset 108:247d8d533a9c
Cut down vastly on the number of config.pri files and places where their contents has to be effectively duplicated without them
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Mon, 24 Oct 2016 17:53:33 +0100 |
| parents | 2586f4be738c |
| children | 535ee33eb8b3 |
| files | vamp-client/ProcessQtTransport.h vamp-client/client.pro vamp-support/LoaderRequests.h |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/vamp-client/ProcessQtTransport.h Thu Oct 20 18:33:36 2016 +0100 +++ b/vamp-client/ProcessQtTransport.h Mon Oct 24 17:53:33 2016 +0100 @@ -80,7 +80,7 @@ qint64 byteCount = m_process->bytesAvailable(); if (!byteCount) { - std::cerr << "waiting for data from server..." << endl; + std::cerr << "waiting for data from server..." << std::endl; m_process->waitForReadyRead(1000); if (m_process->state() == QProcess::NotRunning) { std::cerr << "ERROR: Subprocess exited: Load failed" << std::endl;
--- a/vamp-client/client.pro Thu Oct 20 18:33:36 2016 +0100 +++ b/vamp-client/client.pro Mon Oct 24 17:53:33 2016 +0100 @@ -26,7 +26,7 @@ SOURCES += \ client.cpp \ - ../vamp-capnp/piper.capnp.c++ + ../vamp-capnp/piper-capnp.cpp HEADERS += \ ProcessQtTransport.h \
--- a/vamp-support/LoaderRequests.h Thu Oct 20 18:33:36 2016 +0100 +++ b/vamp-support/LoaderRequests.h Mon Oct 24 17:53:33 2016 +0100 @@ -90,14 +90,14 @@ int defaultChannels = 0; if (plugin->getMinChannelCount() == plugin->getMaxChannelCount()) { - defaultChannels = plugin->getMinChannelCount(); + defaultChannels = int(plugin->getMinChannelCount()); } response.defaultConfiguration = PluginConfiguration::fromPlugin (plugin, defaultChannels, - plugin->getPreferredStepSize(), - plugin->getPreferredBlockSize()); + int(plugin->getPreferredStepSize()), + int(plugin->getPreferredBlockSize())); return response; }