# HG changeset patch
# User Chris Cannam
# Date 1546961177 0
# Node ID 97d12b3d5147ffaf20a756829c47bcba535b573f
# Parent  8081d8053a5ce579adf1023f049a01210109d2af# Parent  12ff1b9ceeeacb000283fee42052b26069731bba
Merge from default branch

diff -r 12ff1b9ceeea -r 97d12b3d5147 base.pri
--- a/base.pri	Tue Jan 08 15:23:33 2019 +0000
+++ b/base.pri	Tue Jan 08 15:26:17 2019 +0000
@@ -7,6 +7,9 @@
 	bqresample \
 	bqaudioio \
 	bqaudioio/bqaudioio \
+	bqaudiostream \
+	bqaudiostream/bqaudiostream \
+	bqthingfactory \
 	piper-vamp-cpp \
 	checker \
 	checker/checker \
@@ -37,5 +40,5 @@
 linux*:   DEFINES += USE_PTHREADS
 macx*:    DEFINES += USE_PTHREADS
 
-CONFIG += qt thread warn_on stl rtti exceptions
+CONFIG += qt thread warn_on stl rtti exceptions object_parallel_to_source
 
diff -r 12ff1b9ceeea -r 97d12b3d5147 bq-files.pri
--- a/bq-files.pri	Tue Jan 08 15:23:33 2019 +0000
+++ b/bq-files.pri	Tue Jan 08 15:26:17 2019 +0000
@@ -24,6 +24,10 @@
 	bqaudioio/src/Log.h \
 	bqaudioio/src/PortAudioIO.h \
 	bqaudioio/src/PulseAudioIO.h \
+        bqaudiostream/bqaudiostream/AudioReadStream.h \
+        bqaudiostream/bqaudiostream/AudioReadStreamFactory.h \
+        bqaudiostream/bqaudiostream/Exceptions.h \
+        bqthingfactory/bqthingfactory/ThingFactory.h \
 	rubberband/rubberband/RubberBandStretcher.h
 
 BQ_SOURCES += \
@@ -40,5 +44,8 @@
 	bqaudioio/src/ResamplerWrapper.cpp \
 	bqaudioio/src/SystemPlaybackTarget.cpp \
 	bqaudioio/src/SystemRecordSource.cpp \
+        bqaudiostream/src/AudioReadStream.cpp \
+        bqaudiostream/src/AudioReadStreamFactory.cpp \
+        bqaudiostream/src/Exceptions.cpp \
         rubberband-all.cpp
         
diff -r 12ff1b9ceeea -r 97d12b3d5147 repoint-lock.json
--- a/repoint-lock.json	Tue Jan 08 15:23:33 2019 +0000
+++ b/repoint-lock.json	Tue Jan 08 15:26:17 2019 +0000
@@ -4,7 +4,7 @@
       "pin": "da86fb0bccb3"
     },
     "svcore": {
-      "pin": "07f23b90701a"
+      "pin": "ff18abb88563"
     },
     "svgui": {
       "pin": "79032214f79d"
@@ -36,6 +36,12 @@
     "bqaudioio": {
       "pin": "8c4162878ae6"
     },
+    "bqaudiostream": {
+      "pin": "e15a373b3efc"
+    },
+    "bqthingfactory": {
+      "pin": "7686116dcdd5"
+    },
     "rubberband": {
       "pin": "6990f06c9f49"
     },
diff -r 12ff1b9ceeea -r 97d12b3d5147 repoint-project.json
--- a/repoint-project.json	Tue Jan 08 15:23:33 2019 +0000
+++ b/repoint-project.json	Tue Jan 08 15:26:17 2019 +0000
@@ -16,7 +16,8 @@
         },
         "svcore": {
             "vcs": "hg",
-            "service": "soundsoftware"
+            "service": "soundsoftware",
+            "branch": "bqaudiostream"
         },
         "svgui": {
             "vcs": "hg",
@@ -66,6 +67,16 @@
             "service": "bitbucket",
             "owner": "breakfastquay"
         },
+        "bqaudiostream": {
+            "vcs": "hg",
+            "service": "bitbucket",
+            "owner": "breakfastquay"
+        },
+        "bqthingfactory": {
+            "vcs": "hg",
+            "service": "bitbucket",
+            "owner": "breakfastquay"
+        },
         "rubberband": {
             "vcs": "hg",
             "service": "bitbucket",
diff -r 12ff1b9ceeea -r 97d12b3d5147 server.pro
--- a/server.pro	Tue Jan 08 15:23:33 2019 +0000
+++ b/server.pro	Tue Jan 08 15:26:17 2019 +0000
@@ -1,7 +1,7 @@
 
 TEMPLATE = app
 
-CONFIG += stl exceptions console warn_on
+CONFIG += stl exceptions console warn_on object_parallel_to_source
 CONFIG -= qt
 
 exists(config.pri) {