summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2018-08-02 00:10:21 -0400
committerGravatar Lioncash2018-08-02 05:18:32 -0400
commitc1c397d37cc71429189b842558f6c6d00c935ebd (patch)
tree80bbfcc60a2a5535e944fd85dd8530ca5e6d0c96
parentMerge pull request #888 from lioncash/caps (diff)
downloadyuzu-c1c397d37cc71429189b842558f6c6d00c935ebd.tar.gz
yuzu-c1c397d37cc71429189b842558f6c6d00c935ebd.tar.xz
yuzu-c1c397d37cc71429189b842558f6c6d00c935ebd.zip
audio_out: Use Buffer::Tag alias in GetTagsAndReleaseBuffers()'s prototype
This makes the Buffer::Tag usage consistent with the Stream class's prototype of GetTagsAndReleaseBuffers().
Diffstat (limited to '')
-rw-r--r--src/audio_core/audio_out.cpp2
-rw-r--r--src/audio_core/audio_out.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/audio_core/audio_out.cpp b/src/audio_core/audio_out.cpp
index 0cabaa354..3dfdf61f9 100644
--- a/src/audio_core/audio_out.cpp
+++ b/src/audio_core/audio_out.cpp
@@ -39,7 +39,7 @@ StreamPtr AudioOut::OpenStream(u32 sample_rate, u32 num_channels,
39 sink->AcquireSinkStream(sample_rate, num_channels)); 39 sink->AcquireSinkStream(sample_rate, num_channels));
40} 40}
41 41
42std::vector<u64> AudioOut::GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count) { 42std::vector<Buffer::Tag> AudioOut::GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count) {
43 return stream->GetTagsAndReleaseBuffers(max_count); 43 return stream->GetTagsAndReleaseBuffers(max_count);
44} 44}
45 45
diff --git a/src/audio_core/audio_out.h b/src/audio_core/audio_out.h
index 8d9b695d4..95e9b53fe 100644
--- a/src/audio_core/audio_out.h
+++ b/src/audio_core/audio_out.h
@@ -24,7 +24,7 @@ public:
24 Stream::ReleaseCallback&& release_callback); 24 Stream::ReleaseCallback&& release_callback);
25 25
26 /// Returns a vector of recently released buffers specified by tag for the specified stream 26 /// Returns a vector of recently released buffers specified by tag for the specified stream
27 std::vector<u64> GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count); 27 std::vector<Buffer::Tag> GetTagsAndReleaseBuffers(StreamPtr stream, size_t max_count);
28 28
29 /// Starts an audio stream for playback 29 /// Starts an audio stream for playback
30 void StartStream(StreamPtr stream); 30 void StartStream(StreamPtr stream);