diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-06 05:35:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-06 05:35:22 +0200 |
commit | bb21c2198a35fe714d5d95c49b93a8848933e9b4 (patch) | |
tree | 2a3da0f4203422bce7f999b9e1597e51ea875bf2 /src/audio_core/audio_out.cpp | |
parent | Merge pull request #927 from bunnei/fix-texs (diff) | |
parent | audio_core: Implement audren_u audio playback. (diff) | |
download | yuzu-bb21c2198a35fe714d5d95c49b93a8848933e9b4.tar yuzu-bb21c2198a35fe714d5d95c49b93a8848933e9b4.tar.gz yuzu-bb21c2198a35fe714d5d95c49b93a8848933e9b4.tar.bz2 yuzu-bb21c2198a35fe714d5d95c49b93a8848933e9b4.tar.lz yuzu-bb21c2198a35fe714d5d95c49b93a8848933e9b4.tar.xz yuzu-bb21c2198a35fe714d5d95c49b93a8848933e9b4.tar.zst yuzu-bb21c2198a35fe714d5d95c49b93a8848933e9b4.zip |
Diffstat (limited to 'src/audio_core/audio_out.cpp')
-rw-r--r-- | src/audio_core/audio_out.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp index 3dfdf61f9..12632a95c 100644 --- a/src/audio_core/audio_out.cpp +++ b/src/audio_core/audio_out.cpp @@ -27,16 +27,16 @@ static Stream::Format ChannelsToStreamFormat(u32 num_channels) { return {}; } -StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, +StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels, std::string&& name, Stream::ReleaseCallback&& release_callback) { if (!sink) { const SinkDetails& sink_details = GetSinkDetails(Settings::values.sink_id); sink = sink_details.factory(Settings::values.audio_device_id); } - return std::make_shared<Stream>(sample_rate, ChannelsToStreamFormat(num_channels), - std::move(release_callback), - sink->AcquireSinkStream(sample_rate, num_channels)); + return std::make_shared<Stream>( + sample_rate, ChannelsToStreamFormat(num_channels), std::move(release_callback), + sink->AcquireSinkStream(sample_rate, num_channels, name), std::move(name)); } std::vector<Buffer::Tag> AudioOut::GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count) { @@ -51,7 +51,7 @@ void AudioOut::StopStream(StreamPtr stream) { stream->Stop(); } -bool AudioOut::QueueBuffer(StreamPtr stream, Buffer::Tag tag, std::vector<u8>&& data) { +bool AudioOut::QueueBuffer(StreamPtr stream, Buffer::Tag tag, std::vector<s16>&& data) { return stream->QueueBuffer(std::make_shared<Buffer>(tag, std::move(data))); } |