Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/aspl/Device.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1202,6 +1202,8 @@ class Device : public Object

//! @}

virtual std::shared_ptr<Stream> CreateStream(const StreamParameters& params);

private:
// value checkers for async setters
OSStatus CheckNominalSampleRate(Float64 rate) const;
Expand All @@ -1223,6 +1225,7 @@ class Device : public Object
std::atomic<UInt32> latency_;
std::atomic<UInt32> safetyOffset_;
std::atomic<UInt32> zeroTimeStampPeriod_;
const bool zeroTimeStampPeriodBasedOffSampleRate_;
std::atomic<Float64> nominalSampleRate_;

std::atomic<SInt32> startCount_ = 0;
Expand Down
14 changes: 12 additions & 2 deletions src/Device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Device::Device(std::shared_ptr<const Context> context, const DeviceParameters& p
, safetyOffset_(params.SafetyOffset)
, zeroTimeStampPeriod_(
params_.ZeroTimeStampPeriod ? params_.ZeroTimeStampPeriod : params_.SampleRate)
, zeroTimeStampPeriodBasedOffSampleRate_(!params_.ZeroTimeStampPeriod)
, nominalSampleRate_(params.SampleRate)
, preferredChannelsForStereo_({1, 2})
{
Expand Down Expand Up @@ -162,6 +163,11 @@ OSStatus Device::SetNominalSampleRateImpl(Float64 rate)
{
nominalSampleRate_ = rate;

if(zeroTimeStampPeriodBasedOffSampleRate_)
{
SetZeroTimeStampPeriodImpl(rate);
}

return kAudioHardwareNoError;
}

Expand Down Expand Up @@ -500,8 +506,7 @@ std::shared_ptr<Stream> Device::AddStreamAsync(Direction dir)

std::shared_ptr<Stream> Device::AddStreamAsync(const StreamParameters& params)
{
auto stream = std::make_shared<Stream>(
GetContext(), std::static_pointer_cast<Device>(shared_from_this()), params);
auto stream = CreateStream(params);

AddStreamAsync(stream);

Expand Down Expand Up @@ -1578,6 +1583,11 @@ OSStatus Device::EndIOOperation(AudioObjectID objectID,
return status;
}

std::shared_ptr<Stream> Device::CreateStream(const StreamParameters& params)
{
return std::make_shared<Stream>(GetContext(), std::static_pointer_cast<Device>(shared_from_this()), params);
}

OSStatus Device::EndIOOperationImpl(UInt32 clientID,
UInt32 operationID,
UInt32 ioFrameCount,
Expand Down
Loading