# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1477328077 -3600
# Node ID 535ee33eb8b3cfd0a357eb6a4429ea17db785150
# Parent  247d8d533a9c007e30513a0483a1e05a226455cc# Parent  c996610b8a4645be9972d7f4c8d644327b78bfac
Merge

diff -r c996610b8a46 -r 535ee33eb8b3 vamp-client/ProcessQtTransport.h
--- a/vamp-client/ProcessQtTransport.h	Mon Oct 24 10:51:21 2016 +0100
+++ b/vamp-client/ProcessQtTransport.h	Mon Oct 24 17:54:37 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;
diff -r c996610b8a46 -r 535ee33eb8b3 vamp-client/client.pro
--- a/vamp-client/client.pro	Mon Oct 24 10:51:21 2016 +0100
+++ b/vamp-client/client.pro	Mon Oct 24 17:54:37 2016 +0100
@@ -26,7 +26,7 @@
 
 SOURCES += \
         client.cpp \
-        ../vamp-capnp/piper.capnp.c++
+        ../vamp-capnp/piper-capnp.cpp
         
 HEADERS += \
         ProcessQtTransport.h \
diff -r c996610b8a46 -r 535ee33eb8b3 vamp-support/LoaderRequests.h
--- a/vamp-support/LoaderRequests.h	Mon Oct 24 10:51:21 2016 +0100
+++ b/vamp-support/LoaderRequests.h	Mon Oct 24 17:54:37 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;
     }