# HG changeset patch # User Chris Cannam # Date 1687853567 -3600 # Tue Jun 27 09:12:47 2023 +0100 # Node ID 1ac3beeccf365964543196126f06e24199c29217 # Parent 279f572ac0c014b1f31c3aada6750da80ed52a7b Adjust local include policy diff --git a/src/AudioReadStream.cpp b/src/AudioReadStream.cpp --- a/src/AudioReadStream.cpp +++ b/src/AudioReadStream.cpp @@ -32,7 +32,7 @@ Software without prior written authorization. */ -#include "AudioReadStream.h" +#include "../bqaudiostream/AudioReadStream.h" #include "bqresample/Resampler.h" diff --git a/src/AudioReadStreamFactory.cpp b/src/AudioReadStreamFactory.cpp --- a/src/AudioReadStreamFactory.cpp +++ b/src/AudioReadStreamFactory.cpp @@ -32,9 +32,9 @@ Software without prior written authorization. */ -#include "AudioReadStreamFactory.h" -#include "AudioReadStream.h" -#include "Exceptions.h" +#include "../bqaudiostream/AudioReadStreamFactory.h" +#include "../bqaudiostream/AudioReadStream.h" +#include "../bqaudiostream/Exceptions.h" #include diff --git a/src/AudioStreamExceptions.cpp b/src/AudioStreamExceptions.cpp --- a/src/AudioStreamExceptions.cpp +++ b/src/AudioStreamExceptions.cpp @@ -33,7 +33,7 @@ Software without prior written authorization. */ -#include "Exceptions.h" +#include "../bqaudiostream/Exceptions.h" using std::string; diff --git a/src/AudioWriteStreamFactory.cpp b/src/AudioWriteStreamFactory.cpp --- a/src/AudioWriteStreamFactory.cpp +++ b/src/AudioWriteStreamFactory.cpp @@ -32,13 +32,13 @@ Software without prior written authorization. */ -#include "AudioWriteStreamFactory.h" -#include "AudioWriteStream.h" +#include "../bqaudiostream/AudioWriteStreamFactory.h" +#include "../bqaudiostream/AudioWriteStream.h" #include "bqthingfactory/ThingFactory.h" -#include "Exceptions.h" +#include "../bqaudiostream/Exceptions.h" -#include "AudioReadStreamFactory.h" +#include "../bqaudiostream/AudioReadStreamFactory.h" namespace breakfastquay { diff --git a/src/CoreAudioReadStream.h b/src/CoreAudioReadStream.h --- a/src/CoreAudioReadStream.h +++ b/src/CoreAudioReadStream.h @@ -35,7 +35,7 @@ #ifndef BQ_CORE_AUDIO_READ_STREAM_H_ #define BQ_CORE_AUDIO_READ_STREAM_H_ -#include "AudioReadStream.h" +#include "../bqaudiostream/AudioReadStream.h" #ifdef HAVE_COREAUDIO diff --git a/src/CoreAudioWriteStream.h b/src/CoreAudioWriteStream.h --- a/src/CoreAudioWriteStream.h +++ b/src/CoreAudioWriteStream.h @@ -35,7 +35,7 @@ #ifndef BQ_CORE_AUDIO_WRITE_STREAM_H #define BQ_CORE_AUDIO_WRITE_STREAM_H -#include "AudioWriteStream.h" +#include "../bqaudiostream/AudioWriteStream.h" #ifdef HAVE_COREAUDIO diff --git a/src/MediaFoundationReadStream.h b/src/MediaFoundationReadStream.h --- a/src/MediaFoundationReadStream.h +++ b/src/MediaFoundationReadStream.h @@ -35,7 +35,7 @@ #ifndef MEDIAFOUNDATION_READ_STREAM_H #define MEDIAFOUNDATION_READ_STREAM_H -#include "AudioReadStream.h" +#include "../bqaudiostream/AudioReadStream.h" #ifdef HAVE_MEDIAFOUNDATION diff --git a/src/MiniMP3ReadStream.h b/src/MiniMP3ReadStream.h --- a/src/MiniMP3ReadStream.h +++ b/src/MiniMP3ReadStream.h @@ -35,7 +35,7 @@ #ifndef BQ_MINIMP3_READ_STREAM_H #define BQ_MINIMP3_READ_STREAM_H -#include "AudioReadStream.h" +#include "../bqaudiostream/AudioReadStream.h" #ifdef HAVE_MINIMP3 diff --git a/src/OggVorbisReadStream.h b/src/OggVorbisReadStream.h --- a/src/OggVorbisReadStream.h +++ b/src/OggVorbisReadStream.h @@ -35,7 +35,7 @@ #ifndef BQ_OGG_VORBIS_READ_STREAM_H_ #define BQ_OGG_VORBIS_READ_STREAM_H_ -#include "AudioReadStream.h" +#include "../bqaudiostream/AudioReadStream.h" #ifdef HAVE_OGGZ #ifdef HAVE_FISHSOUND diff --git a/src/OpusReadStream.h b/src/OpusReadStream.h --- a/src/OpusReadStream.h +++ b/src/OpusReadStream.h @@ -35,7 +35,7 @@ #ifndef BQ_OPUS_READ_STREAM_H #define BQ_OPUS_READ_STREAM_H -#include "AudioReadStream.h" +#include "../bqaudiostream/AudioReadStream.h" #ifdef HAVE_OPUS diff --git a/src/OpusWriteStream.h b/src/OpusWriteStream.h --- a/src/OpusWriteStream.h +++ b/src/OpusWriteStream.h @@ -35,7 +35,7 @@ #ifndef BQ_OPUS_WRITE_STREAM_H #define BQ_OPUS_WRITE_STREAM_H -#include "AudioWriteStream.h" +#include "../bqaudiostream/AudioWriteStream.h" #ifdef HAVE_OPUS diff --git a/src/SimpleWavFileReadStream.h b/src/SimpleWavFileReadStream.h --- a/src/SimpleWavFileReadStream.h +++ b/src/SimpleWavFileReadStream.h @@ -35,7 +35,7 @@ #ifndef BQ_SIMPLE_WAV_FILE_READ_STREAM_H #define BQ_SIMPLE_WAV_FILE_READ_STREAM_H -#include "AudioReadStream.h" +#include "../bqaudiostream/AudioReadStream.h" // If we have libsndfile, we shouldn't be using this class #if ! (defined(HAVE_LIBSNDFILE) || defined(HAVE_SNDFILE)) diff --git a/src/SimpleWavFileWriteStream.cpp b/src/SimpleWavFileWriteStream.cpp --- a/src/SimpleWavFileWriteStream.cpp +++ b/src/SimpleWavFileWriteStream.cpp @@ -36,7 +36,7 @@ #if ! (defined(HAVE_LIBSNDFILE) || defined(HAVE_SNDFILE)) -#include "Exceptions.h" +#include "../bqaudiostream/Exceptions.h" #include #include diff --git a/src/SimpleWavFileWriteStream.h b/src/SimpleWavFileWriteStream.h --- a/src/SimpleWavFileWriteStream.h +++ b/src/SimpleWavFileWriteStream.h @@ -35,7 +35,7 @@ #ifndef BQ_SIMPLE_WAV_FILE_WRITE_STREAM_H #define BQ_SIMPLE_WAV_FILE_WRITE_STREAM_H -#include "AudioWriteStream.h" +#include "../bqaudiostream/AudioWriteStream.h" // If we have libsndfile, we shouldn't be using this class #if ! (defined(HAVE_LIBSNDFILE) || defined(HAVE_SNDFILE)) diff --git a/src/WavFileReadStream.cpp b/src/WavFileReadStream.cpp --- a/src/WavFileReadStream.cpp +++ b/src/WavFileReadStream.cpp @@ -35,7 +35,7 @@ #if defined(HAVE_LIBSNDFILE) || defined(HAVE_SNDFILE) #include "WavFileReadStream.h" -#include "Exceptions.h" +#include "../bqaudiostream/Exceptions.h" #include diff --git a/src/WavFileReadStream.h b/src/WavFileReadStream.h --- a/src/WavFileReadStream.h +++ b/src/WavFileReadStream.h @@ -35,7 +35,7 @@ #ifndef BQ_WAV_FILE_READ_STREAM_H_ #define BQ_WAV_FILE_READ_STREAM_H_ -#include "AudioReadStream.h" +#include "../bqaudiostream/AudioReadStream.h" #if defined(HAVE_LIBSNDFILE) || defined(HAVE_SNDFILE) diff --git a/src/WavFileWriteStream.cpp b/src/WavFileWriteStream.cpp --- a/src/WavFileWriteStream.cpp +++ b/src/WavFileWriteStream.cpp @@ -35,7 +35,7 @@ #if defined(HAVE_LIBSNDFILE) || defined(HAVE_SNDFILE) #include "WavFileWriteStream.h" -#include "Exceptions.h" +#include "../bqaudiostream/Exceptions.h" #include diff --git a/src/WavFileWriteStream.h b/src/WavFileWriteStream.h --- a/src/WavFileWriteStream.h +++ b/src/WavFileWriteStream.h @@ -35,7 +35,7 @@ #ifndef BQ_WAV_FILE_WRITE_STREAM_H_ #define BQ_WAV_FILE_WRITE_STREAM_H_ -#include "AudioWriteStream.h" +#include "../bqaudiostream/AudioWriteStream.h" #if defined(HAVE_LIBSNDFILE) || defined(HAVE_SNDFILE)