diff --git a/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj b/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj
index 9165238..6a867c4 100644
--- a/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj
+++ b/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj
@@ -97,7 +97,7 @@
true
true
true
- $(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)
+ $(SolutionDir)../../../include;$(SolutionDir)../../../third_party;%(AdditionalIncludeDirectories)
__WINDOWS_DS__;%(PreprocessorDefinitions)
@@ -113,7 +113,7 @@
true
true
true
- $(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)
+ $(SolutionDir)../../../include;$(SolutionDir)../../../third_party;%(AdditionalIncludeDirectories)
__WINDOWS_DS__;%(PreprocessorDefinitions)
@@ -124,10 +124,13 @@
+
+
+
diff --git a/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj.filters b/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj.filters
index 8e6e979..2ed9ab1 100644
--- a/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj.filters
+++ b/examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj.filters
@@ -17,10 +17,19 @@
third_party
+
+ src
+
third_party
+
+ src
+
+
+ src
+
\ No newline at end of file
diff --git a/src/AudioDevice.cpp b/examples/src/AudioDevice.cpp
similarity index 99%
rename from src/AudioDevice.cpp
rename to examples/src/AudioDevice.cpp
index a5bda60..66043e8 100644
--- a/src/AudioDevice.cpp
+++ b/examples/src/AudioDevice.cpp
@@ -28,8 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include
#include
#include
-
-using namespace nqr;
+#include
static RingBufferT buffer(BUFFER_LENGTH);
static RingBufferT record_buffer(BUFFER_LENGTH / 2);
diff --git a/include/libnyquist/AudioDevice.h b/examples/src/AudioDevice.h
similarity index 66%
rename from include/libnyquist/AudioDevice.h
rename to examples/src/AudioDevice.h
index 8717076..385b2b3 100644
--- a/include/libnyquist/AudioDevice.h
+++ b/examples/src/AudioDevice.h
@@ -28,45 +28,38 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AUDIO_DEVICE_H
#define AUDIO_DEVICE_H
-#include "Common.h"
#include "RingBuffer.h"
#include "rtaudio/RtAudio.h"
+#include
+#include
-namespace nqr
+static const uint32_t FRAME_SIZE = 512;
+static const int32_t CHANNELS = 2;
+static const int32_t BUFFER_LENGTH = FRAME_SIZE * CHANNELS;
+
+struct AudioDeviceInfo
{
+ uint32_t id;
+ uint32_t numChannels;
+ uint32_t sampleRate;
+ uint32_t frameSize;
+ bool isPlaying = false;
+};
- const uint32_t FRAME_SIZE = 512;
- const int32_t CHANNELS = 2;
- const int32_t BUFFER_LENGTH = FRAME_SIZE * CHANNELS;
-
- struct AudioDeviceInfo
- {
- uint32_t id;
- uint32_t numChannels;
- uint32_t sampleRate;
- uint32_t frameSize;
- bool isPlaying = false;
- };
-
- class AudioDevice
- {
- NO_MOVE(AudioDevice);
- std::unique_ptr rtaudio;
- public:
-
- AudioDeviceInfo info;
-
- AudioDevice(int numChannels, int sampleRate, int deviceId = -1);
- ~AudioDevice();
-
- bool Open(const int deviceId);
- bool Play(const std::vector & data);
-
- bool Record(const uint32_t lengthInSamples, std::vector & recordingBuffer);
-
- static void ListAudioDevices();
- };
-
-} // end namespace nqr
+class AudioDevice
+{
+ std::unique_ptr rtaudio;
+protected:
+ AudioDevice(const AudioDevice& r) = delete;
+ AudioDevice & operator = (const AudioDevice& r) = delete;
+public:
+ AudioDeviceInfo info;
+ AudioDevice(int numChannels, int sampleRate, int deviceId = -1);
+ ~AudioDevice();
+ static void ListAudioDevices();
+ bool Open(const int deviceId);
+ bool Play(const std::vector & data);
+ bool Record(const uint32_t lengthInSamples, std::vector & recordingBuffer);
+};
#endif
diff --git a/examples/src/Main.cpp b/examples/src/Main.cpp
index a83a1b6..a6aae75 100644
--- a/examples/src/Main.cpp
+++ b/examples/src/Main.cpp
@@ -6,7 +6,8 @@
#pragma comment(lib, "dsound.lib")
#endif
-#include "libnyquist/AudioDevice.h"
+#include "AudioDevice.h"
+
#include "libnyquist/AudioDecoder.h"
#include "libnyquist/WavEncoder.h"
#include "libnyquist/PostProcess.h"
@@ -97,7 +98,6 @@ int main(int argc, const char **argv) try
myDevice.Record(fileData->sampleRate * fileData->lengthSeconds, fileData->samples);
*/
- // Libnyquist does not (currently) perform sample rate conversion - not exactly true, anymore. See below.
if (fileData->sampleRate != desiredSampleRate)
{
std::cout << "[Warning - Sample Rate Mismatch] - file is sampled at " << fileData->sampleRate << " and output is " << desiredSampleRate << std::endl;
diff --git a/include/libnyquist/RingBuffer.h b/examples/src/RingBuffer.h
similarity index 100%
rename from include/libnyquist/RingBuffer.h
rename to examples/src/RingBuffer.h
diff --git a/libnyquist.vcxproj/v140/libnyquist.vcxproj b/libnyquist.vcxproj/v140/libnyquist.vcxproj
index 35df6b2..bdf8c43 100644
--- a/libnyquist.vcxproj/v140/libnyquist.vcxproj
+++ b/libnyquist.vcxproj/v140/libnyquist.vcxproj
@@ -24,7 +24,6 @@
-
@@ -45,10 +44,8 @@
-
-
diff --git a/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters b/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
index b8c7378..50dac55 100644
--- a/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
+++ b/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
@@ -13,9 +13,6 @@
src
-
- src
-
src
@@ -66,9 +63,6 @@
include
-
- include
-
include
@@ -90,9 +84,6 @@
include
-
- include\util
-
include\util