diff options
| author | 2019-02-12 19:26:37 -0500 | |
|---|---|---|
| committer | 2019-02-12 19:26:37 -0500 | |
| commit | 8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch) | |
| tree | 83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/audio_core/stream.h | |
| parent | Merge pull request #2104 from ReinUsesLisp/compute-assert (diff) | |
| parent | core_timing: Rename CoreTiming namespace to Core::Timing (diff) | |
| download | yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.gz yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.tar.xz yuzu-8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4.zip | |
Merge pull request #2110 from lioncash/namespace
core_timing: Rename CoreTiming namespace to Core::Timing
Diffstat (limited to 'src/audio_core/stream.h')
| -rw-r--r-- | src/audio_core/stream.h | 22 |
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 @@ | |||
| 13 | #include "audio_core/buffer.h" | 13 | #include "audio_core/buffer.h" |
| 14 | #include "common/common_types.h" | 14 | #include "common/common_types.h" |
| 15 | 15 | ||
| 16 | namespace CoreTiming { | 16 | namespace Core::Timing { |
| 17 | struct EventType; | 17 | struct EventType; |
| 18 | } | 18 | } |
| 19 | 19 | ||
| @@ -91,16 +91,16 @@ private: | |||
| 91 | /// Gets the number of core cycles when the specified buffer will be released | 91 | /// Gets the number of core cycles when the specified buffer will be released |
| 92 | s64 GetBufferReleaseCycles(const Buffer& buffer) const; | 92 | s64 GetBufferReleaseCycles(const Buffer& buffer) const; |
| 93 | 93 | ||
| 94 | u32 sample_rate; ///< Sample rate of the stream | 94 | u32 sample_rate; ///< Sample rate of the stream |
| 95 | Format format; ///< Format of the stream | 95 | Format format; ///< Format of the stream |
| 96 | ReleaseCallback release_callback; ///< Buffer release callback for the stream | 96 | ReleaseCallback release_callback; ///< Buffer release callback for the stream |
| 97 | State state{State::Stopped}; ///< Playback state of the stream | 97 | State state{State::Stopped}; ///< Playback state of the stream |
| 98 | CoreTiming::EventType* release_event{}; ///< Core timing release event for the stream | 98 | Core::Timing::EventType* release_event{}; ///< Core timing release event for the stream |
| 99 | BufferPtr active_buffer; ///< Actively playing buffer in the stream | 99 | BufferPtr active_buffer; ///< Actively playing buffer in the stream |
| 100 | std::queue<BufferPtr> queued_buffers; ///< Buffers queued to be played in the stream | 100 | std::queue<BufferPtr> queued_buffers; ///< Buffers queued to be played in the stream |
| 101 | std::queue<BufferPtr> released_buffers; ///< Buffers recently released from the stream | 101 | std::queue<BufferPtr> released_buffers; ///< Buffers recently released from the stream |
| 102 | SinkStream& sink_stream; ///< Output sink for the stream | 102 | SinkStream& sink_stream; ///< Output sink for the stream |
| 103 | std::string name; ///< Name of the stream, must be unique | 103 | std::string name; ///< Name of the stream, must be unique |
| 104 | }; | 104 | }; |
| 105 | 105 | ||
| 106 | using StreamPtr = std::shared_ptr<Stream>; | 106 | using StreamPtr = std::shared_ptr<Stream>; |