Mercurial > hg > svapp
changeset 376:98afba87887f
Merge from branch tonioni (the two are currently in sync)
| author | Chris Cannam |
|---|---|
| date | Wed, 18 Jun 2014 18:30:50 +0100 |
| parents | dfcc5b355f33 (current diff) 1162c93e7688 (diff) |
| children | 3c724eac1798 |
| files | |
| diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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);
--- 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
--- 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