Skip to content

Commit

Permalink
updated examples & readme
Browse files Browse the repository at this point in the history
  • Loading branch information
ozguronsoy committed Jan 3, 2025
1 parent 1f74417 commit d865aa4
Show file tree
Hide file tree
Showing 13 changed files with 507 additions and 445 deletions.
14 changes: 10 additions & 4 deletions HephAudio/HeaderFiles/Audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,15 @@ namespace HephAudio
/** @copydoc HephAudio::Native::NativeAudio::InitializeRender() */
void InitializeRender();

/** @copydoc HephAudio::Native::NativeAudio::InitializeRender(AudioChannelLayout,uint32_t) */
void InitializeRender(AudioChannelLayout channelLayout, uint32_t sampleRate);
/** @copydoc HephAudio::Native::NativeAudio::InitializeRender(const AudioChannelLayout&,uint32_t) */
void InitializeRender(const AudioChannelLayout& channelLayout, uint32_t sampleRate);

/** @copydoc HephAudio::Native::NativeAudio::InitializeRender(AudioFormatInfo) */
void InitializeRender(AudioFormatInfo format);

/** @copydoc HephAudio::Native::NativeAudio::InitializeRender(AudioDevice*,const AudioChannelLayout&,uint32_t) */
void InitializeRender(AudioDevice* device, const AudioChannelLayout& channelLayout, uint32_t sampleRate);

/** @copydoc HephAudio::Native::NativeAudio::InitializeRender(AudioDevice*,AudioFormatInfo) */
void InitializeRender(AudioDevice* device, AudioFormatInfo format);

Expand All @@ -171,12 +174,15 @@ namespace HephAudio
/** @copydoc HephAudio::Native::NativeAudio::InitializeCapture() */
void InitializeCapture();

/** @copydoc HephAudio::Native::NativeAudio::InitializeCapture(AudioChannelLayout,uint32_t) */
void InitializeCapture(AudioChannelLayout channelLayout, uint32_t sampleRate);
/** @copydoc HephAudio::Native::NativeAudio::InitializeCapture(const AudioChannelLayout&,uint32_t) */
void InitializeCapture(const AudioChannelLayout& channelLayout, uint32_t sampleRate);

/** @copydoc HephAudio::Native::NativeAudio::InitializeCapture(AudioFormatInfo) */
void InitializeCapture(AudioFormatInfo format);

/** @copydoc HephAudio::Native::NativeAudio::InitializeCapture(AudioDevice*,const AudioChannelLayout&,uint32_t) */
void InitializeCapture(AudioDevice* device, const AudioChannelLayout& channelLayout, uint32_t sampleRate);

/** @copydoc HephAudio::Native::NativeAudio::InitializeCapture(AudioDevice*,AudioFormatInfo) */
void InitializeCapture(AudioDevice* device, AudioFormatInfo format);

Expand Down
22 changes: 20 additions & 2 deletions HephAudio/HeaderFiles/NativeAudio/NativeAudio.h
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ namespace HephAudio
* @param channelLayout channel layout of the render format.
* @param sampleRate sample rate of the render format.
*/
void InitializeRender(AudioChannelLayout channelLayout, uint32_t sampleRate);
void InitializeRender(const AudioChannelLayout& channelLayout, uint32_t sampleRate);

/**
* initializes rendering with the default device and the provided format.
Expand All @@ -396,6 +396,15 @@ namespace HephAudio
*/
void InitializeRender(AudioFormatInfo format);

/**
* initializes rendering with the provided device and the provided format.
*
* @param device pointer to the audio render device.
* @param channelLayout channel layout of the render format.
* @param sampleRate sample rate of the render format.
*/
void InitializeRender(AudioDevice* device, const AudioChannelLayout& channelLayout, uint32_t sampleRate);

/**
* initializes rendering with the provided device and the provided format.
*
Expand All @@ -422,7 +431,7 @@ namespace HephAudio
* @param channelLayout channel layout of the capture format.
* @param sampleRate sample rate of the capture format.
*/
void InitializeCapture(AudioChannelLayout channelLayout, uint32_t sampleRate);
void InitializeCapture(const AudioChannelLayout& channelLayout, uint32_t sampleRate);

/**
* initializes capturing with the default device and the provided format.
Expand All @@ -431,6 +440,15 @@ namespace HephAudio
*/
void InitializeCapture(AudioFormatInfo format);

/**
* initializes capturing with the provided device and the provided format.
*
* @param device pointer to the audio capture device.
* @param channelLayout channel layout of the capture format.
* @param sampleRate sample rate of the capture format.
*/
void InitializeCapture(AudioDevice* device, const AudioChannelLayout& channelLayout, uint32_t sampleRate);

/**
* initializes capturing with the provided device and the provided format.
*
Expand Down
14 changes: 12 additions & 2 deletions HephAudio/SourceFiles/Audio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ namespace HephAudio
this->pNativeAudio->InitializeRender();
}

void Audio::InitializeRender(AudioChannelLayout channelLayout, uint32_t sampleRate)
void Audio::InitializeRender(const AudioChannelLayout& channelLayout, uint32_t sampleRate)
{
this->pNativeAudio->InitializeRender(channelLayout, sampleRate);
}
Expand All @@ -176,6 +176,11 @@ namespace HephAudio
this->pNativeAudio->InitializeRender(format);
}

void Audio::InitializeRender(AudioDevice* device, const AudioChannelLayout& channelLayout, uint32_t sampleRate)
{
this->pNativeAudio->InitializeRender(device, channelLayout, sampleRate);
}

void Audio::InitializeRender(AudioDevice* device, AudioFormatInfo format)
{
this->pNativeAudio->InitializeRender(device, format);
Expand All @@ -191,7 +196,7 @@ namespace HephAudio
this->pNativeAudio->InitializeCapture();
}

void Audio::InitializeCapture(AudioChannelLayout channelLayout, uint32_t sampleRate)
void Audio::InitializeCapture(const AudioChannelLayout& channelLayout, uint32_t sampleRate)
{
this->pNativeAudio->InitializeCapture(channelLayout, sampleRate);
}
Expand All @@ -201,6 +206,11 @@ namespace HephAudio
this->pNativeAudio->InitializeCapture(format);
}

void Audio::InitializeCapture(AudioDevice* device, const AudioChannelLayout& channelLayout, uint32_t sampleRate)
{
this->pNativeAudio->InitializeCapture(device, channelLayout, sampleRate);
}

void Audio::InitializeCapture(AudioDevice* device, AudioFormatInfo format)
{
this->pNativeAudio->InitializeCapture(device, format);
Expand Down
2 changes: 1 addition & 1 deletion HephAudio/SourceFiles/AudioEffects/OlaEffect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using namespace Heph;

namespace HephAudio
{
OlaEffect::OlaEffect() : OlaEffect(0) {}
OlaEffect::OlaEffect() : OlaEffect(512) {}

OlaEffect::OlaEffect(size_t hopSize) : OlaEffect(hopSize, HannWindow(hopSize * 4)) {}

Expand Down
14 changes: 12 additions & 2 deletions HephAudio/SourceFiles/NativeAudio/NativeAudio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ namespace HephAudio
this->InitializeRender(nullptr, HEPHAUDIO_INTERNAL_FORMAT(HEPHAUDIO_CH_LAYOUT_STEREO, 48000));
}

void NativeAudio::InitializeRender(AudioChannelLayout channelLayout, uint32_t sampleRate)
void NativeAudio::InitializeRender(const AudioChannelLayout& channelLayout, uint32_t sampleRate)
{
this->InitializeRender(nullptr, HEPHAUDIO_INTERNAL_FORMAT(channelLayout, sampleRate));
}
Expand All @@ -265,12 +265,17 @@ namespace HephAudio
this->InitializeRender(nullptr, format);
}

void NativeAudio::InitializeRender(AudioDevice* device, const AudioChannelLayout& channelLayout, uint32_t sampleRate)
{
this->InitializeRender(device, HEPHAUDIO_INTERNAL_FORMAT(channelLayout, sampleRate));
}

void NativeAudio::InitializeCapture()
{
this->InitializeCapture(nullptr, HEPHAUDIO_INTERNAL_FORMAT(HEPHAUDIO_CH_LAYOUT_STEREO, 48000));
}

void NativeAudio::InitializeCapture(AudioChannelLayout channelLayout, uint32_t sampleRate)
void NativeAudio::InitializeCapture(const AudioChannelLayout& channelLayout, uint32_t sampleRate)
{
this->InitializeCapture(nullptr, HEPHAUDIO_INTERNAL_FORMAT(channelLayout, sampleRate));
}
Expand All @@ -280,6 +285,11 @@ namespace HephAudio
this->InitializeCapture(nullptr, format);
}

void NativeAudio::InitializeCapture(AudioDevice* device, const AudioChannelLayout& channelLayout, uint32_t sampleRate)
{
this->InitializeCapture(device, HEPHAUDIO_INTERNAL_FORMAT(channelLayout, sampleRate));
}

AudioDevice NativeAudio::GetAudioDeviceById(const std::string& deviceId) const
{
std::vector<AudioDevice> devices = GetAudioDevices(AudioDeviceType::All);
Expand Down
Loading

0 comments on commit d865aa4

Please sign in to comment.