# HG changeset patch
# User Chris Cannam
# Date 1403112650 -3600
# Node ID 98afba87887f41ae6042bd907c2d15315957d4ea
# Parent  dfcc5b355f33005e177317d738031a8515812c4e# Parent  1162c93e76880751100f7bf42969fa9b5176e13c
Merge from branch tonioni (the two are currently in sync)

diff -r dfcc5b355f33 -r 98afba87887f audioio/AudioPortAudioTarget.cpp
--- a/audioio/AudioPortAudioTarget.cpp	Wed Jun 18 13:51:38 2014 +0100
+++ b/audioio/AudioPortAudioTarget.cpp	Wed Jun 18 18:30:50 2014 +0100
@@ -185,7 +185,7 @@
 
 int
 AudioPortAudioTarget::process(const void *, void *outputBuffer,
-                              unsigned long nframes,
+                              int nframes,
                               const PaStreamCallbackTimeInfo *,
                               PaStreamCallbackFlags)
 {
diff -r dfcc5b355f33 -r 98afba87887f audioio/AudioPortAudioTarget.h
--- a/audioio/AudioPortAudioTarget.h	Wed Jun 18 13:51:38 2014 +0100
+++ b/audioio/AudioPortAudioTarget.h	Wed Jun 18 18:30:50 2014 +0100
@@ -46,7 +46,7 @@
     virtual void sourceModelReplaced();
 
 protected:
-    int process(const void *input, void *output, unsigned long frames,
+    int process(const void *input, void *output, int frames,
                 const PaStreamCallbackTimeInfo *timeInfo,
                 PaStreamCallbackFlags statusFlags);
 
diff -r dfcc5b355f33 -r 98afba87887f configure
--- a/configure	Wed Jun 18 13:51:38 2014 +0100
+++ b/configure	Wed Jun 18 18:30:50 2014 +0100
@@ -4202,7 +4202,7 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-        CXXFLAGS_DEBUG="-Wall -Woverloaded-virtual -Wextra -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
+        CXXFLAGS_DEBUG="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
    	CXXFLAGS_RELEASE="-g0 -O2 -Wall -pipe"
    	CXXFLAGS_MINIMAL="-g0 -O0"
 fi
diff -r dfcc5b355f33 -r 98afba87887f configure.ac
--- a/configure.ac	Wed Jun 18 13:51:38 2014 +0100
+++ b/configure.ac	Wed Jun 18 18:30:50 2014 +0100
@@ -50,7 +50,7 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-        CXXFLAGS_DEBUG="-Wall -Woverloaded-virtual -Wextra -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
+        CXXFLAGS_DEBUG="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
    	CXXFLAGS_RELEASE="-g0 -O2 -Wall -pipe"
    	CXXFLAGS_MINIMAL="-g0 -O0"
 fi