# HG changeset patch # User Chris Cannam # Date 1543937157 0 # Node ID bc3d0c86ee2e140d6d9b065166c123e4db354f25 # Parent 3a4202cae7fe06d1483a90f053f9c57c3fad418c Bring in bqaudiostream sources diff -r 3a4202cae7fe -r bc3d0c86ee2e base.pri --- a/base.pri Tue Dec 04 10:57:36 2018 +0000 +++ b/base.pri Tue Dec 04 15:25:57 2018 +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 3a4202cae7fe -r bc3d0c86ee2e bq-files.pri --- a/bq-files.pri Tue Dec 04 10:57:36 2018 +0000 +++ b/bq-files.pri Tue Dec 04 15:25:57 2018 +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 3a4202cae7fe -r bc3d0c86ee2e repoint-lock.json --- a/repoint-lock.json Tue Dec 04 10:57:36 2018 +0000 +++ b/repoint-lock.json Tue Dec 04 15:25:57 2018 +0000 @@ -36,6 +36,12 @@ "bqaudioio": { "pin": "8c4162878ae6" }, + "bqaudiostream": { + "pin": "5b66c6b42c30" + }, + "bqthingfactory": { + "pin": "7686116dcdd5" + }, "rubberband": { "pin": "6990f06c9f49" }, diff -r 3a4202cae7fe -r bc3d0c86ee2e repoint-project.json --- a/repoint-project.json Tue Dec 04 10:57:36 2018 +0000 +++ b/repoint-project.json Tue Dec 04 15:25:57 2018 +0000 @@ -66,6 +66,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 3a4202cae7fe -r bc3d0c86ee2e server.pro --- a/server.pro Tue Dec 04 10:57:36 2018 +0000 +++ b/server.pro Tue Dec 04 15:25:57 2018 +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) {