summaryrefslogtreecommitdiffstats
path: root/src/audio_core/stream.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-02-13 01:26:37 +0100
committerGitHub <noreply@github.com>2019-02-13 01:26:37 +0100
commit8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch)
tree83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/audio_core/stream.h
parentMerge pull request #2104 from ReinUsesLisp/compute-assert (diff)
parentcore_timing: Rename CoreTiming namespace to Core::Timing (diff)
downloadyuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.gz
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.bz2
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.lz
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.xz
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.zst
yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.zip
Diffstat (limited to 'src/audio_core/stream.h')
-rw-r--r--src/audio_core/stream.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/audio_core/stream.h b/src/audio_core/stream.h
index aebfeb51d..caa775544 100644
--- a/src/audio_core/stream.h
+++ b/src/audio_core/stream.h
@@ -13,7 +13,7 @@
#include "audio_core/buffer.h"
#include "common/common_types.h"
-namespace CoreTiming {
+namespace Core::Timing {
struct EventType;
}
@@ -91,16 +91,16 @@ private:
/// Gets the number of core cycles when the specified buffer will be released
s64 GetBufferReleaseCycles(const Buffer& buffer) const;
- u32 sample_rate; ///< Sample rate of the stream
- Format format; ///< Format of the stream
- ReleaseCallback release_callback; ///< Buffer release callback for the stream
- State state{State::Stopped}; ///< Playback state of the stream
- CoreTiming::EventType* release_event{}; ///< Core timing release event for the stream
- BufferPtr active_buffer; ///< Actively playing buffer in the stream
- std::queue<BufferPtr> queued_buffers; ///< Buffers queued to be played in the stream
- std::queue<BufferPtr> released_buffers; ///< Buffers recently released from the stream
- SinkStream& sink_stream; ///< Output sink for the stream
- std::string name; ///< Name of the stream, must be unique
+ u32 sample_rate; ///< Sample rate of the stream
+ Format format; ///< Format of the stream
+ ReleaseCallback release_callback; ///< Buffer release callback for the stream
+ State state{State::Stopped}; ///< Playback state of the stream
+ Core::Timing::EventType* release_event{}; ///< Core timing release event for the stream
+ BufferPtr active_buffer; ///< Actively playing buffer in the stream
+ std::queue<BufferPtr> queued_buffers; ///< Buffers queued to be played in the stream
+ std::queue<BufferPtr> released_buffers; ///< Buffers recently released from the stream
+ SinkStream& sink_stream; ///< Output sink for the stream
+ std::string name; ///< Name of the stream, must be unique
};
using StreamPtr = std::shared_ptr<Stream>;