Mercurial > hg > sonic-visualiser

changeset 2179:97d12b3d5147 bqaudiostream

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 08 Jan 2019 15:26:17 +0000
parents 8081d8053a5c (diff) 12ff1b9ceeea (current diff)
children a889ccb50ec6
files repoint-lock.json
diffstat 5 files changed, 31 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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
         
--- 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"
     },
--- 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",
--- 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) {