Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-27 08:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AudioStream: Make fields protected instead of private

Browse source
This commit is contained in:
Connor McLaughlin 2021-06-04 13:37:23 +10:00
parent 350049826f
commit aac85299ea
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/common/audio_stream.h
View file

@ -72,15 +72,29 @@ protected:
return s16((s32(sample) * s32(volume)) / 100); return s16((s32(sample) * s32(volume)) / 100);
} }
ALWAYS_INLINE u32 GetBufferSpace() const { return (m_max_samples - m_buffer.GetSize()); }
ALWAYS_INLINE void ReleaseBufferLock(std::unique_lock<std::mutex> lock)
{
// lock is released implicitly by destruction
m_buffer_draining_cv.notify_one();
}
bool SetBufferSize(u32 buffer_size); bool SetBufferSize(u32 buffer_size);
bool IsDeviceOpen() const { return (m_output_sample_rate > 0); } bool IsDeviceOpen() const { return (m_output_sample_rate > 0); }
void EnsureBuffer(u32 size);
void LockedEmptyBuffers(); void LockedEmptyBuffers();
u32 GetSamplesAvailable() const; u32 GetSamplesAvailable() const;
u32 GetSamplesAvailableLocked() const; u32 GetSamplesAvailableLocked() const;
void ReadFrames(SampleType* samples, u32 num_frames, bool apply_volume); void ReadFrames(SampleType* samples, u32 num_frames, bool apply_volume);
void DropFrames(u32 count); void DropFrames(u32 count);
void CreateResampler();
void DestroyResampler();
void ResetResampler();
void InternalSetInputSampleRate(u32 sample_rate);
void ResampleInput(std::unique_lock<std::mutex> buffer_lock);
u32 m_input_sample_rate = 0; u32 m_input_sample_rate = 0;
u32 m_output_sample_rate = 0; u32 m_output_sample_rate = 0;
u32 m_channels = 0; u32 m_channels = 0;
@ -89,22 +103,6 @@ protected:
// volume, 0-100 // volume, 0-100
u32 m_output_volume = FullVolume; u32 m_output_volume = FullVolume;
private:
ALWAYS_INLINE u32 GetBufferSpace() const { return (m_max_samples - m_buffer.GetSize()); }
ALWAYS_INLINE void ReleaseBufferLock(std::unique_lock<std::mutex> lock)
{
// lock is released implicitly by destruction
m_buffer_draining_cv.notify_one();
}
void EnsureBuffer(u32 size);
void CreateResampler();
void DestroyResampler();
void ResetResampler();
void InternalSetInputSampleRate(u32 sample_rate);
void ResampleInput(std::unique_lock<std::mutex> buffer_lock);
HeapFIFOQueue<SampleType, MaxSamples> m_buffer; HeapFIFOQueue<SampleType, MaxSamples> m_buffer;
mutable std::mutex m_buffer_mutex; mutable std::mutex m_buffer_mutex;
std::condition_variable m_buffer_draining_cv; std::condition_variable m_buffer_draining_cv;