diff options
| author | Alex Marsev <alex.marsev@gmail.com> | 2015-09-18 17:13:01 +0300 |
|---|---|---|
| committer | Alex Marsev <alex.marsev@gmail.com> | 2015-09-18 18:42:42 +0300 |
| commit | 8593ed436ea882359e1ef45bfc98bf06b16a76e3 (patch) | |
| tree | 8673b22fd7a9924fadbc556064cb7ade9670e76f | |
| parent | 9f059101522f45e4061832b07d5b19abf7a6aad3 (diff) | |
Cosmetics
| -rw-r--r-- | src/AudioDeviceManager.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/AudioDeviceManager.cpp b/src/AudioDeviceManager.cpp index 1936e77..784ae68 100644 --- a/src/AudioDeviceManager.cpp +++ b/src/AudioDeviceManager.cpp @@ -9,30 +9,30 @@ namespace SaneAudioRenderer {
WAVEFORMATEX BuildWaveFormat(WORD formatTag, uint32_t formatBits, uint32_t rate, uint32_t channelCount)
{
- WAVEFORMATEX ret;
+ WAVEFORMATEX format;
- ret.wFormatTag = formatTag;
- ret.nChannels = channelCount;
- ret.nSamplesPerSec = rate;
- ret.nAvgBytesPerSec = formatBits / 8 * channelCount * rate;
- ret.nBlockAlign = formatBits / 8 * channelCount;
- ret.wBitsPerSample = formatBits;
- ret.cbSize = (formatTag == WAVE_FORMAT_EXTENSIBLE) ? 22 : 0;
+ format.wFormatTag = formatTag;
+ format.nChannels = channelCount;
+ format.nSamplesPerSec = rate;
+ format.nAvgBytesPerSec = formatBits / 8 * channelCount * rate;
+ format.nBlockAlign = formatBits / 8 * channelCount;
+ format.wBitsPerSample = formatBits;
+ format.cbSize = (formatTag == WAVE_FORMAT_EXTENSIBLE) ? 22 : 0;
- return ret;
+ return format;
}
WAVEFORMATEXTENSIBLE BuildWaveFormatExt(GUID formatGuid, uint32_t formatBits, WORD formatExtProps,
uint32_t rate, uint32_t channelCount, DWORD channelMask)
{
- WAVEFORMATEXTENSIBLE ret;
+ WAVEFORMATEXTENSIBLE format;
- ret.Format = BuildWaveFormat(WAVE_FORMAT_EXTENSIBLE, formatBits, rate, channelCount);
- ret.Samples.wValidBitsPerSample = formatExtProps;
- ret.dwChannelMask = channelMask;
- ret.SubFormat = formatGuid;
+ format.Format = BuildWaveFormat(WAVE_FORMAT_EXTENSIBLE, formatBits, rate, channelCount);
+ format.Samples.wValidBitsPerSample = formatExtProps;
+ format.dwChannelMask = channelMask;
+ format.SubFormat = formatGuid;
- return ret;
+ return format;
}
template <typename T>
@@ -252,7 +252,8 @@ namespace SaneAudioRenderer {
assert(DspFormatFromWaveFormat(f.Format) != DspFormat::Unknown);
- if (SUCCEEDED(backend->audioClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE, &f.Format, nullptr)))
+ if (SUCCEEDED(backend->audioClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,
+ &f.Format, nullptr)))
{
backend->dspFormat = DspFormatFromWaveFormat(f.Format);
backend->waveFormat = CopyWaveFormat(f.Format);
|