# HG changeset patch
# User Chris Cannam
# Date 1487711415 0
# Node ID ecdb78d5549a7899b10f37a3da6ebdd44354130a
# Parent 2db9579bef3bf3bfd57805366f17e381c965c00d# Parent b321e3c78fa261ae7e7057da75234ab078680226
Merge
diff -r 2db9579bef3b -r ecdb78d5549a .hgsubstate
--- a/.hgsubstate Tue Feb 21 21:09:26 2017 +0000
+++ b/.hgsubstate Tue Feb 21 21:10:15 2017 +0000
@@ -1,13 +1,13 @@
-4542e34b7d8cc86a4b12651d692dcdb63f45e9e5 bqaudioio
+f02e616cc1aa2abb36252a94b8fe1fa83fc23160 bqaudioio
fb508f7cdcdc245add2de6811acda46745516716 bqfft
a867fff0963dd91df0fd99c81d690c1155e73645 bqresample
-8ebb96e345b6f351aae0ca2f424fbaae19de8165 bqvec
+4d06ab1a8550d45ab67653f2212da775d79e9a03 bqvec
d4548b18eaf20cb10045cf246af891d491c8cc32 checker
3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay
3d2cde3b1ab3d39c7f9e542250c288a9da0f6850 icons/scalable
-458766b73e719256439f71b0c3442e167e728dbc piper-cpp
+328ffacfc70e50fb78cad0c28d3c32851d40e04d piper-cpp
95867ba8caa86f69fdd57366dbfe2f977dd9cb5d sv-dependency-builds
-48cfa4e2bfc13b302f86ec17910249ee47cd9989 svapp
-ce08318aad83e4be3b6f2898f87cca2d9aaabdb8 svcore
-4d0ca1ab4cd0a51538ebe96f391f28163074114a svgui
-ea8e56f0796afebe78e9e678f4b674c1d7fb279e vamp-plugin-sdk
+0bb2ec333d3b56a43f89cf03040492101ce19d54 svapp
+0a729b57b4e4cc7f8e2fcec446de529344c9041f svcore
+a496986aa61bc96c63338928cf26e29ad773ff61 svgui
+8701366604c7d23fdcf13b9732cb92debec65b19 vamp-plugin-sdk
diff -r 2db9579bef3b -r ecdb78d5549a .hgtags
--- a/.hgtags Tue Feb 21 21:09:26 2017 +0000
+++ b/.hgtags Tue Feb 21 21:10:15 2017 +0000
@@ -55,3 +55,4 @@
7a8e909a15da99ff87928a0be0475f214a450d14 sv_v3.0beta2
7a8e909a15da99ff87928a0be0475f214a450d14 sv_v3.0beta2
b6f1052dbda12b33c5bc0ea4ae33d4764da10b31 sv_v3.0beta2
+881d7f99bba33a35852bd0dcfa19367f6b306e14 sv_v3.0beta3
diff -r 2db9579bef3b -r ecdb78d5549a bq-files.pri
--- a/bq-files.pri Tue Feb 21 21:09:26 2017 +0000
+++ b/bq-files.pri Tue Feb 21 21:10:15 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 2db9579bef3b -r ecdb78d5549a sonic-visualiser.qrc
--- a/sonic-visualiser.qrc Tue Feb 21 21:09:26 2017 +0000
+++ b/sonic-visualiser.qrc Tue Feb 21 21:10:15 2017 +0000
@@ -3,50 +3,53 @@
icons/scalable/align.svg
icons/scalable/colour3d.svg
icons/scalable/cross.svg
+ icons/scalable/datadelete.svg
icons/scalable/dataedit.svg
- icons/scalable/datadelete.svg
icons/scalable/draw.svg
- icons/scalable/erase.svg
icons/scalable/editcopy.svg
icons/scalable/editcut.svg
icons/scalable/editdelete.svg
icons/scalable/editpaste.svg
+ icons/scalable/erase.svg
icons/scalable/exit.svg
+ icons/scalable/faders.svg
icons/scalable/filenew.svg
icons/scalable/fileopen.svg
+ icons/scalable/filesave.svg
icons/scalable/filesaveas.svg
- icons/scalable/filesave.svg
icons/scalable/filesavesv.svg
+ icons/scalable/ffwd.svg
icons/scalable/ffwd-end.svg
- icons/scalable/ffwd.svg
+ icons/scalable/help.svg
+ icons/scalable/instants.svg
+ icons/scalable/measure.svg
+ icons/scalable/move.svg
icons/scalable/navigate.svg
- icons/scalable/move.svg
icons/scalable/normalise.svg
icons/scalable/normalise-columns.svg
+ icons/scalable/notes.svg
+ icons/scalable/pane.svg
icons/scalable/pause.svg
icons/scalable/playloop.svg
icons/scalable/playpause.svg
icons/scalable/playselection.svg
icons/scalable/playfollow.svg
- icons/scalable/solo.svg
icons/scalable/play.svg
icons/scalable/record.svg
+ icons/scalable/redo.svg
+ icons/scalable/regions.svg
icons/scalable/rewind-start.svg
icons/scalable/rewind.svg
- icons/scalable/undo.svg
- icons/scalable/redo.svg
icons/scalable/select.svg
- icons/scalable/measure.svg
+ icons/scalable/solo.svg
icons/scalable/speaker.svg
- icons/scalable/instants.svg
- icons/scalable/notes.svg
- icons/scalable/values.svg
- icons/scalable/regions.svg
icons/scalable/spectrogram.svg
icons/scalable/spectrum.svg
- icons/scalable/pane.svg
icons/scalable/text.svg
icons/scalable/timeruler.svg
+ icons/scalable/undo.svg
+ icons/scalable/values.svg
+ icons/scalable/waveform.svg
icons/scalable/zoom.svg
icons/scalable/zoom-in.svg
icons/scalable/zoom-out.svg
@@ -57,84 +60,22 @@
icons/scalable/sv-splash.svg
icons/scalable/sv-splash.png
icons/scalable/sv-splash@2x.png
- icons/scalable/waveform.svg
- icons/scalable/faders.svg
- icons/scalable/help.svg
- icons/waveform.png
- icons/spectrum.png
- icons/spectrogram.png
- icons/pane.png
- icons/instants.png
- icons/notes.png
+
icons/image.png
- icons/values.png
- icons/regions.png
- icons/colour3d.png
- icons/playpause.png
- icons/playpause-on.png
- icons/ffwd.png
- icons/ffwd-end.png
- icons/rewind.png
- icons/rewind-start.png
- icons/playselection.png
- icons/playselection-on.png
- icons/playloop.png
- icons/playfollow.png
- icons/solo.png
- icons/solo-on.png
- icons/align.png
- icons/align-on.png
- icons/fader_background.png
- icons/fader_knob.png
- icons/fader_knob_red.png
- icons/fader_leds.png
- icons/faders.png
- icons/select.png
- icons/text.png
- icons/draw.png
icons/draw-curve.png
- icons/erase.png
icons/measure.png
icons/measure1cursor.xbm
icons/measure1mask.xbm
icons/measure2cursor.xbm
icons/measure2mask.xbm
- icons/move.png
- icons/navigate.png
- icons/zoom-reset.png
- icons/undo.png
- icons/redo.png
icons/new.png
- icons/exit.png
- icons/speaker.png
icons/annotation.png
icons/info.png
- icons/fileopen.png
- icons/fileopensession.png
- icons/fileopenaudio.png
- icons/fileopen-22.png
- icons/fileclose.png
- icons/filenew.png
- icons/filenew-22.png
- icons/filesave.png
- icons/filesave-22.png
- icons/filesaveas.png
- icons/filesaveas-22.png
- icons/editdelete.png
- icons/editcut.png
- icons/editcopy.png
- icons/editpaste.png
- icons/datadelete.png
- icons/dataedit.png
icons/datainsert.png
icons/mono.png
icons/stereo.png
icons/sharpen.png
- icons/help.png
icons/emptypage.png
- icons/cross.png
- icons/normalise.png
- icons/normalise-columns.png
icons/invert-vertical.png
icons/show-peaks.png
icons/opaque.png