Rename SamplesRate to SampleRate and ChannelsCount to ChannelCount (#199)
* Rename SamplesRate to SampleRate and samples_rate to sample_rate * Rename ChannelsCount to ChannelCount * Update CHANGELOG for SamplesRate and ChannelsCount renaming
This commit is contained in:
parent
f2728f6bdf
commit
fcc75f4566
8 changed files with 44 additions and 42 deletions
|
|
@ -7,10 +7,10 @@ use std::ptr;
|
|||
use std::slice;
|
||||
use std::sync::{Arc, Mutex, MutexGuard};
|
||||
|
||||
use ChannelsCount;
|
||||
use ChannelCount;
|
||||
use FormatsEnumerationError;
|
||||
use SampleFormat;
|
||||
use SamplesRate;
|
||||
use SampleRate;
|
||||
use SupportedFormat;
|
||||
|
||||
use super::check_result;
|
||||
|
|
@ -144,7 +144,7 @@ impl Endpoint {
|
|||
},
|
||||
winapi::WAVE_FORMAT_EXTENSIBLE => {
|
||||
let format_ptr = format_ptr as *const winapi::WAVEFORMATEXTENSIBLE;
|
||||
let channels = (*format_ptr).Format.nChannels as ChannelsCount;
|
||||
let channels = (*format_ptr).Format.nChannels as ChannelCount;
|
||||
let format = {
|
||||
fn cmp_guid(a: &winapi::GUID, b: &winapi::GUID) -> bool {
|
||||
a.Data1 == b.Data1 && a.Data2 == b.Data2 && a.Data3 == b.Data3 &&
|
||||
|
|
@ -172,8 +172,8 @@ impl Endpoint {
|
|||
|
||||
SupportedFormat {
|
||||
channels: channels,
|
||||
min_samples_rate: SamplesRate((*format_ptr).nSamplesPerSec),
|
||||
max_samples_rate: SamplesRate((*format_ptr).nSamplesPerSec),
|
||||
min_sample_rate: SampleRate((*format_ptr).nSamplesPerSec),
|
||||
max_sample_rate: SampleRate((*format_ptr).nSamplesPerSec),
|
||||
data_type: data_type,
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -472,9 +472,9 @@ fn format_to_waveformatextensible(format: &Format)
|
|||
SampleFormat::U16 => return Err(CreationError::FormatNotSupported),
|
||||
},
|
||||
nChannels: format.channels as winapi::WORD,
|
||||
nSamplesPerSec: format.samples_rate.0 as winapi::DWORD,
|
||||
nSamplesPerSec: format.sample_rate.0 as winapi::DWORD,
|
||||
nAvgBytesPerSec: format.channels as winapi::DWORD *
|
||||
format.samples_rate.0 as winapi::DWORD *
|
||||
format.sample_rate.0 as winapi::DWORD *
|
||||
format.data_type.sample_size() as winapi::DWORD,
|
||||
nBlockAlign: format.channels as winapi::WORD *
|
||||
format.data_type.sample_size() as winapi::WORD,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue