alex
/
libnyquist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove RtAudio & AudioDevice dependency from core library; move into sample project

Browse Source
pull/18/head
dimitri 9 years ago
parent e3f4a9e61c
commit 77938cd0be
8 changed files with 45 additions and 53 deletions
Show Stats Download Patch File Download Diff File

7
examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj
Unescape Escape View File

@ -97,7 +97,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)../../../include;$(SolutionDir)../../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
@ -113,7 +113,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)../../../include;$(SolutionDir)../../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
@ -124,10 +124,13 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\third_party\rtaudio\RtAudio.cpp" />
<ClCompile Include="..\..\src\AudioDevice.cpp" />
<ClCompile Include="..\..\src\Main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\third_party\rtaudio\RtAudio.h" />
<ClInclude Include="..\..\src\AudioDevice.h" />
<ClInclude Include="..\..\src\RingBuffer.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\libnyquist.vcxproj\v140\libnyquist.vcxproj">

9
examples/libnyquist-examples.vcxproj/v140/libnyquist-examples.vcxproj.filters
Unescape Escape View File

@ -17,10 +17,19 @@
<ClCompile Include="..\..\..\third_party\rtaudio\RtAudio.cpp">
<Filter>third_party</Filter>
</ClCompile>
<ClCompile Include="..\..\src\AudioDevice.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\third_party\rtaudio\RtAudio.h">
<Filter>third_party</Filter>
</ClInclude>
<ClInclude Include="..\..\src\AudioDevice.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\src\RingBuffer.h">
<Filter>src</Filter>
</ClInclude>
</ItemGroup>
</Project>

3
src/AudioDevice.cpp → examples/src/AudioDevice.cpp
Unescape Escape View File

@ -28,8 +28,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <algorithm>
#include <thread>
#include <chrono>
using namespace nqr;
#include <iostream>
static RingBufferT<float> buffer(BUFFER_LENGTH);
static RingBufferT<float> record_buffer(BUFFER_LENGTH / 2);

63
include/libnyquist/AudioDevice.h → examples/src/AudioDevice.h
Unescape Escape View File

@ -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 <vector>
#include <memory>
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> rtaudio;
public:
AudioDeviceInfo info;
AudioDevice(int numChannels, int sampleRate, int deviceId = -1);
~AudioDevice();
bool Open(const int deviceId);
bool Play(const std::vector<float> & data);
bool Record(const uint32_t lengthInSamples, std::vector<float> & recordingBuffer);
static void ListAudioDevices();
};
} // end namespace nqr
class AudioDevice
{
std::unique_ptr<RtAudio> 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<float> & data);
bool Record(const uint32_t lengthInSamples, std::vector<float> & recordingBuffer);
};
#endif

4
examples/src/Main.cpp
Unescape Escape View File

@ -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;

0
include/libnyquist/RingBuffer.h → examples/src/RingBuffer.h
Unescape Escape View File

3
libnyquist.vcxproj/v140/libnyquist.vcxproj
Unescape Escape View File

@ -24,7 +24,6 @@
<ClCompile Include="$(ProjectDir)..\..\src\FlacDecoder.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\OpusDecoder.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\WavDecoder.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\AudioDevice.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\WavPackDecoder.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\CafDecoder.cpp" />
<ClCompile Include="$(ProjectDir)..\..\src\FlacDependencies.c" />
@ -45,10 +44,8 @@
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h" />
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\PostProcess.h" />
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavDecoder.h" />
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDevice.h" />
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Common.h" />
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Dither.h" />
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RingBuffer.h" />
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavPackDecoder.h" />
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\CafDecoder.h" />
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\VorbisDecoder.h" />

9
libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
Unescape Escape View File

@ -13,9 +13,6 @@
<ClCompile Include="$(ProjectDir)..\..\src\CafDecoder.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="$(ProjectDir)..\..\src\AudioDevice.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="$(ProjectDir)..\..\src\FlacDecoder.cpp">
<Filter>src</Filter>
</ClCompile>
@ -66,9 +63,6 @@
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDevice.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\CafDecoder.h">
<Filter>include</Filter>
</ClInclude>
@ -90,9 +84,6 @@
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavPackDecoder.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RingBuffer.h">
<Filter>include\util</Filter>
</ClInclude>
<ClInclude Include="$(ProjectDir)..\..\include\libnyquist\PostProcess.h">
<Filter>include\util</Filter>
</ClInclude>

Write Preview
Loading…
Cancel
Save