# HG changeset patch
# User Chris Cannam
# Date 1487869526 0
# Node ID 4b9ffeca9bfe5b863bad90d91ac5763191b2c3f0
# Parent  f1122192f44cae50d5f8144447a957d8ad582cd8# Parent  6702d05d4448caa17007b1da2fe83cbfb9332fe0
merge

diff -r f1122192f44c -r 4b9ffeca9bfe .hgsubstate
--- a/.hgsubstate	Fri Feb 10 14:49:45 2017 +0000
+++ b/.hgsubstate	Thu Feb 23 17:05:26 2017 +0000
@@ -1,13 +1,13 @@
-4542e34b7d8cc86a4b12651d692dcdb63f45e9e5 bqaudioio
+0a7a3dfd9c85cfbafdd351cf0db85463ddbef2d0 bqaudioio
 fb508f7cdcdc245add2de6811acda46745516716 bqfft
 a867fff0963dd91df0fd99c81d690c1155e73645 bqresample
-8ebb96e345b6f351aae0ca2f424fbaae19de8165 bqvec
-d4548b18eaf20cb10045cf246af891d491c8cc32 checker
+4d06ab1a8550d45ab67653f2212da775d79e9a03 bqvec
+146d42909e712134774f0b2a12498b1d841b6e8e checker
 3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay
 3d2cde3b1ab3d39c7f9e542250c288a9da0f6850 icons/scalable
-8dff3213f77c0f662c6590d8eb8951321bb00f5a piper-cpp
+328ffacfc70e50fb78cad0c28d3c32851d40e04d piper-cpp
 95867ba8caa86f69fdd57366dbfe2f977dd9cb5d sv-dependency-builds
-48cfa4e2bfc13b302f86ec17910249ee47cd9989 svapp
-0d45fff7ccd1177d7da1c3902665388bf2e34eac svcore
-4d0ca1ab4cd0a51538ebe96f391f28163074114a svgui
-ea8e56f0796afebe78e9e678f4b674c1d7fb279e vamp-plugin-sdk
+050c7b5bd11cd76b4ca12b4501de74c438451725 svapp
+9b52f1a952b5ea62810aedbf99e2ad884ea6e580 svcore
+3ec95b7d1bfcf8eecfcde5063328c25fc5e71b81 svgui
+8701366604c7d23fdcf13b9732cb92debec65b19 vamp-plugin-sdk
diff -r f1122192f44c -r 4b9ffeca9bfe .hgtags
--- a/.hgtags	Fri Feb 10 14:49:45 2017 +0000
+++ b/.hgtags	Thu Feb 23 17:05:26 2017 +0000
@@ -56,3 +56,6 @@
 7a8e909a15da99ff87928a0be0475f214a450d14 sv_v3.0beta2
 b6f1052dbda12b33c5bc0ea4ae33d4764da10b31 sv_v3.0beta2
 881d7f99bba33a35852bd0dcfa19367f6b306e14 sv_v3.0beta3
+2f13bdee5cb541f22ac6567ba55faf2aa23277df sv_v3.0beta4
+2f13bdee5cb541f22ac6567ba55faf2aa23277df sv_v3.0beta4
+d739444d2c489f79572017902e9b5b4ec961cbbe sv_v3.0beta4
diff -r f1122192f44c -r 4b9ffeca9bfe bq-files.pri
--- a/bq-files.pri	Fri Feb 10 14:49:45 2017 +0000
+++ b/bq-files.pri	Thu Feb 23 17:05:26 2017 +0000
@@ -21,6 +21,7 @@
 	bqaudioio/bqaudioio/SystemRecordSource.h \
 	bqaudioio/src/DynamicJACK.h \
 	bqaudioio/src/JACKAudioIO.h \
+	bqaudioio/src/Log.h \
 	bqaudioio/src/PortAudioIO.h \
 	bqaudioio/src/PulseAudioIO.h
 
@@ -32,6 +33,7 @@
 	bqresample/src/Resampler.cpp \
 	bqaudioio/src/AudioFactory.cpp \
 	bqaudioio/src/JACKAudioIO.cpp \
+	bqaudioio/src/Log.cpp \
 	bqaudioio/src/PortAudioIO.cpp \
 	bqaudioio/src/PulseAudioIO.cpp \
 	bqaudioio/src/ResamplerWrapper.cpp \
diff -r f1122192f44c -r 4b9ffeca9bfe deploy/linux/docker/Dockerfile_v3.0beta3_ubuntu1604
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/docker/Dockerfile_v3.0beta3_ubuntu1604	Thu Feb 23 17:05:26 2017 +0000
@@ -0,0 +1,43 @@
+FROM ubuntu:16.04
+MAINTAINER Chris Cannam <cannam@all-day-breakfast.com>
+RUN apt-get update
+RUN apt-get install -y \
+    build-essential \
+    libbz2-dev \
+    libfftw3-dev \
+    libfishsound1-dev \
+    libid3tag0-dev \
+    liblo-dev \
+    liblrdf0-dev \
+    libmad0-dev \
+    liboggz2-dev \
+    libpulse-dev \
+    libsamplerate-dev \
+    libsndfile-dev \
+    libsord-dev \
+    libxml2-utils \
+    portaudio19-dev \
+    qt5-default libqt5svg5-dev \
+    raptor-utils \
+    librubberband-dev \
+    git \
+    mercurial \
+    curl wget \
+    autoconf automake libtool lintian
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8
+RUN git clone https://github.com/sandstorm-io/capnproto
+WORKDIR capnproto/c++
+RUN ./setup-autotools.sh && autoreconf -i 
+RUN ./configure --enable-static --disable-shared
+RUN make && make install
+WORKDIR ../..
+RUN hg clone -rsv_v3.0beta3 https://code.soundsoftware.ac.uk/hg/sonic-visualiser
+WORKDIR sonic-visualiser
+RUN ./configure
+RUN make -j3
+RUN deploy/linux/deploy-deb.sh 3.0beta3-1 amd64
+RUN tar cvf output.tar *.deb && cp output.tar ..
diff -r f1122192f44c -r 4b9ffeca9bfe deploy/linux/docker/Dockerfile_v3.0beta4_ubuntu1604
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/docker/Dockerfile_v3.0beta4_ubuntu1604	Thu Feb 23 17:05:26 2017 +0000
@@ -0,0 +1,43 @@
+FROM ubuntu:16.04
+MAINTAINER Chris Cannam <cannam@all-day-breakfast.com>
+RUN apt-get update
+RUN apt-get install -y \
+    build-essential \
+    libbz2-dev \
+    libfftw3-dev \
+    libfishsound1-dev \
+    libid3tag0-dev \
+    liblo-dev \
+    liblrdf0-dev \
+    libmad0-dev \
+    liboggz2-dev \
+    libpulse-dev \
+    libsamplerate-dev \
+    libsndfile-dev \
+    libsord-dev \
+    libxml2-utils \
+    portaudio19-dev \
+    qt5-default libqt5svg5-dev \
+    raptor-utils \
+    librubberband-dev \
+    git \
+    mercurial \
+    curl wget \
+    autoconf automake libtool lintian
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8
+RUN git clone https://github.com/sandstorm-io/capnproto
+WORKDIR capnproto/c++
+RUN ./setup-autotools.sh && autoreconf -i 
+RUN ./configure --enable-static --disable-shared
+RUN make && make install
+WORKDIR ../..
+RUN hg clone -rsv_v3.0beta4 https://code.soundsoftware.ac.uk/hg/sonic-visualiser
+WORKDIR sonic-visualiser
+RUN ./configure
+RUN make -j3
+RUN deploy/linux/deploy-deb.sh 3.0beta4-1 amd64
+RUN tar cvf output.tar *.deb && cp output.tar ..
diff -r f1122192f44c -r 4b9ffeca9bfe deploy/win32/build.cmd
--- a/deploy/win32/build.cmd	Fri Feb 10 14:49:45 2017 +0000
+++ b/deploy/win32/build.cmd	Thu Feb 23 17:05:26 2017 +0000
@@ -5,7 +5,7 @@
 )
 DEL sonic-visualiser.msi
 %WIXPATH%\candle.exe -v sonic-visualiser.wxs
-%WIXPATH%\light.exe -b ..\..\..\build-sonic-visualiser-Desktop_Qt_5_7_0_MinGW_32bit-Release -ext WixUIExtension -v sonic-visualiser.wixobj
+%WIXPATH%\light.exe -b ..\..\..\build-sonic-visualiser-Desktop_Qt_5_7_0_MinGW_32bit-Release -ext WixUIExtension -ext WixUtilExtension -v sonic-visualiser.wixobj
 PAUSE
 DEL sonic-visualiser.wixobj
 DEL sonic-visualiser.wixpdb
diff -r f1122192f44c -r 4b9ffeca9bfe deploy/win32/sonic-visualiser.wxs
--- a/deploy/win32/sonic-visualiser.wxs	Fri Feb 10 14:49:45 2017 +0000
+++ b/deploy/win32/sonic-visualiser.wxs	Thu Feb 23 17:05:26 2017 +0000
@@ -245,7 +245,14 @@
     
     <Icon Id="winicon.ico" SourceFile="..\sonic-visualiser\icons\sv-winicon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
-    
+<!--
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch Sonic Visualiser now"/>
+    <Property Id="WixShellExecTarget" Value="[#SVExecutable]"/>
+    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes"/>
+-->
+    <WixVariable Id="WixUIBannerBmp" Value="..\sonic-visualiser\deploy\win32\top.bmp"/>
+    <WixVariable Id="WixUIDialogBmp" Value="..\sonic-visualiser\deploy\win32\main.bmp"/>
+
   </Product>
 </Wix>
 
diff -r f1122192f44c -r 4b9ffeca9bfe deploy/win64/sonic-visualiser.wxs
--- a/deploy/win64/sonic-visualiser.wxs	Fri Feb 10 14:49:45 2017 +0000
+++ b/deploy/win64/sonic-visualiser.wxs	Thu Feb 23 17:05:26 2017 +0000
@@ -289,7 +289,10 @@
     
     <Icon Id="winicon.ico" SourceFile="..\sonic-visualiser\icons\sv-winicon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
-    
+
+    <WixVariable Id="WixUIBannerBmp" Value="..\sonic-visualiser\deploy\win32\top.bmp"/>
+    <WixVariable Id="WixUIDialogBmp" Value="..\sonic-visualiser\deploy\win32\main.bmp"/>
+
   </Product>
 </Wix>
 
diff -r f1122192f44c -r 4b9ffeca9bfe sonic-visualiser.qrc
--- a/sonic-visualiser.qrc	Fri Feb 10 14:49:45 2017 +0000
+++ b/sonic-visualiser.qrc	Thu Feb 23 17:05:26 2017 +0000
@@ -3,50 +3,53 @@
     <file>icons/scalable/align.svg</file>
     <file>icons/scalable/colour3d.svg</file>
     <file>icons/scalable/cross.svg</file>
+    <file>icons/scalable/datadelete.svg</file>
     <file>icons/scalable/dataedit.svg</file>
-    <file>icons/scalable/datadelete.svg</file>
     <file>icons/scalable/draw.svg</file>
-    <file>icons/scalable/erase.svg</file>
     <file>icons/scalable/editcopy.svg</file>
     <file>icons/scalable/editcut.svg</file>
     <file>icons/scalable/editdelete.svg</file>
     <file>icons/scalable/editpaste.svg</file>
+    <file>icons/scalable/erase.svg</file>
     <file>icons/scalable/exit.svg</file>
+    <file>icons/scalable/faders.svg</file>
     <file>icons/scalable/filenew.svg</file>
     <file>icons/scalable/fileopen.svg</file>
+    <file>icons/scalable/filesave.svg</file>
     <file>icons/scalable/filesaveas.svg</file>
-    <file>icons/scalable/filesave.svg</file>
     <file>icons/scalable/filesavesv.svg</file>
+    <file>icons/scalable/ffwd.svg</file>
     <file>icons/scalable/ffwd-end.svg</file>
-    <file>icons/scalable/ffwd.svg</file>
+    <file>icons/scalable/help.svg</file>
+    <file>icons/scalable/instants.svg</file>
+    <file>icons/scalable/measure.svg</file>
+    <file>icons/scalable/move.svg</file>
     <file>icons/scalable/navigate.svg</file>
-    <file>icons/scalable/move.svg</file>
     <file>icons/scalable/normalise.svg</file>
     <file>icons/scalable/normalise-columns.svg</file>
+    <file>icons/scalable/notes.svg</file>
+    <file>icons/scalable/pane.svg</file>
     <file>icons/scalable/pause.svg</file>
     <file>icons/scalable/playloop.svg</file>
     <file>icons/scalable/playpause.svg</file>
     <file>icons/scalable/playselection.svg</file>
     <file>icons/scalable/playfollow.svg</file>
-    <file>icons/scalable/solo.svg</file>
     <file>icons/scalable/play.svg</file>
     <file>icons/scalable/record.svg</file>
+    <file>icons/scalable/redo.svg</file>
+    <file>icons/scalable/regions.svg</file>
     <file>icons/scalable/rewind-start.svg</file>
     <file>icons/scalable/rewind.svg</file>
-    <file>icons/scalable/undo.svg</file>
-    <file>icons/scalable/redo.svg</file>
     <file>icons/scalable/select.svg</file>
-    <file>icons/scalable/measure.svg</file>
+    <file>icons/scalable/solo.svg</file>
     <file>icons/scalable/speaker.svg</file>
-    <file>icons/scalable/instants.svg</file>
-    <file>icons/scalable/notes.svg</file>
-    <file>icons/scalable/values.svg</file>
-    <file>icons/scalable/regions.svg</file>
     <file>icons/scalable/spectrogram.svg</file>
     <file>icons/scalable/spectrum.svg</file>
-    <file>icons/scalable/pane.svg</file>
     <file>icons/scalable/text.svg</file>
     <file>icons/scalable/timeruler.svg</file>
+    <file>icons/scalable/undo.svg</file>
+    <file>icons/scalable/values.svg</file>
+    <file>icons/scalable/waveform.svg</file>
     <file>icons/scalable/zoom.svg</file>
     <file>icons/scalable/zoom-in.svg</file>
     <file>icons/scalable/zoom-out.svg</file>
@@ -57,84 +60,22 @@
     <file>icons/scalable/sv-splash.svg</file>
     <file>icons/scalable/sv-splash.png</file>
     <file>icons/scalable/sv-splash@2x.png</file>
-    <file>icons/scalable/waveform.svg</file>
-    <file>icons/scalable/faders.svg</file>
-    <file>icons/scalable/help.svg</file>
-    <file>icons/waveform.png</file>
-    <file>icons/spectrum.png</file>
-    <file>icons/spectrogram.png</file>
-    <file>icons/pane.png</file>
-    <file>icons/instants.png</file>
-    <file>icons/notes.png</file>
+
     <file>icons/image.png</file>
-    <file>icons/values.png</file>
-    <file>icons/regions.png</file>
-    <file>icons/colour3d.png</file>
-    <file>icons/playpause.png</file>
-    <file>icons/playpause-on.png</file>
-    <file>icons/ffwd.png</file>
-    <file>icons/ffwd-end.png</file>
-    <file>icons/rewind.png</file>
-    <file>icons/rewind-start.png</file>
-    <file>icons/playselection.png</file>
-    <file>icons/playselection-on.png</file>
-    <file>icons/playloop.png</file>
-    <file>icons/playfollow.png</file>
-    <file>icons/solo.png</file>
-    <file>icons/solo-on.png</file>
-    <file>icons/align.png</file>
-    <file>icons/align-on.png</file>
-    <file>icons/fader_background.png</file>
-    <file>icons/fader_knob.png</file>
-    <file>icons/fader_knob_red.png</file>
-    <file>icons/fader_leds.png</file>
-    <file>icons/faders.png</file>
-    <file>icons/select.png</file>
-    <file>icons/text.png</file>
-    <file>icons/draw.png</file>
     <file>icons/draw-curve.png</file>
-    <file>icons/erase.png</file>
     <file>icons/measure.png</file>
     <file>icons/measure1cursor.xbm</file>
     <file>icons/measure1mask.xbm</file>
     <file>icons/measure2cursor.xbm</file>
     <file>icons/measure2mask.xbm</file>
-    <file>icons/move.png</file>
-    <file>icons/navigate.png</file>
-    <file>icons/zoom-reset.png</file>
-    <file>icons/undo.png</file>
-    <file>icons/redo.png</file>
     <file>icons/new.png</file>
-    <file>icons/exit.png</file>
-    <file>icons/speaker.png</file>
     <file>icons/annotation.png</file>
     <file>icons/info.png</file>
-    <file>icons/fileopen.png</file>
-    <file>icons/fileopensession.png</file>
-    <file>icons/fileopenaudio.png</file>
-    <file>icons/fileopen-22.png</file>
-    <file>icons/fileclose.png</file>
-    <file>icons/filenew.png</file>
-    <file>icons/filenew-22.png</file>
-    <file>icons/filesave.png</file>
-    <file>icons/filesave-22.png</file>
-    <file>icons/filesaveas.png</file>
-    <file>icons/filesaveas-22.png</file>
-    <file>icons/editdelete.png</file>
-    <file>icons/editcut.png</file>
-    <file>icons/editcopy.png</file>
-    <file>icons/editpaste.png</file>
-    <file>icons/datadelete.png</file>
-    <file>icons/dataedit.png</file>
     <file>icons/datainsert.png</file>
     <file>icons/mono.png</file>
     <file>icons/stereo.png</file>
     <file>icons/sharpen.png</file>
-    <file>icons/help.png</file>
     <file>icons/emptypage.png</file>
-    <file>icons/cross.png</file>
-    <file>icons/normalise.png</file>
-    <file>icons/normalise-columns.png</file>
     <file>icons/invert-vertical.png</file>
     <file>icons/show-peaks.png</file>
     <file>icons/opaque.png</file>
diff -r f1122192f44c -r 4b9ffeca9bfe version.h
--- a/version.h	Fri Feb 10 14:49:45 2017 +0000
+++ b/version.h	Thu Feb 23 17:05:26 2017 +0000
@@ -1,1 +1,1 @@
-#define SV_VERSION "3.0-beta3"
+#define SV_VERSION "3.0-beta4"