summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-09-24 02:01:02 +0200
committerLioncash <mathew1800@gmail.com>2018-09-24 02:03:38 +0200
commit2f6a6113118a6d23bc88b7c3e3d1bfee28c11f63 (patch)
tree52a37fb98b002943669ab96ad1bdecd3cd42f6d9 /src
parentAdded glObjectLabels for renderdoc for textures and shader programs (#1384) (diff)
downloadyuzu-2f6a6113118a6d23bc88b7c3e3d1bfee28c11f63.tar
yuzu-2f6a6113118a6d23bc88b7c3e3d1bfee28c11f63.tar.gz
yuzu-2f6a6113118a6d23bc88b7c3e3d1bfee28c11f63.tar.bz2
yuzu-2f6a6113118a6d23bc88b7c3e3d1bfee28c11f63.tar.lz
yuzu-2f6a6113118a6d23bc88b7c3e3d1bfee28c11f63.tar.xz
yuzu-2f6a6113118a6d23bc88b7c3e3d1bfee28c11f63.tar.zst
yuzu-2f6a6113118a6d23bc88b7c3e3d1bfee28c11f63.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/audio_renderer.cpp2
-rw-r--r--src/audio_core/audio_renderer.h2
-rw-r--r--src/audio_core/stream.cpp4
-rw-r--r--src/audio_core/stream.h14
-rw-r--r--src/core/hle/service/audio/audren_u.cpp2
5 files changed, 12 insertions, 12 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp
index 521b19ff7..6f0ff953a 100644
--- a/src/audio_core/audio_renderer.cpp
+++ b/src/audio_core/audio_renderer.cpp
@@ -79,7 +79,7 @@ u32 AudioRenderer::GetMixBufferCount() const {
return worker_params.mix_buffer_count;
}
-u32 AudioRenderer::GetState() const {
+Stream::State AudioRenderer::GetStreamState() const {
return stream->GetState();
}
diff --git a/src/audio_core/audio_renderer.h b/src/audio_core/audio_renderer.h
index be923ee65..dfef89e1d 100644
--- a/src/audio_core/audio_renderer.h
+++ b/src/audio_core/audio_renderer.h
@@ -170,7 +170,7 @@ public:
u32 GetSampleRate() const;
u32 GetSampleCount() const;
u32 GetMixBufferCount() const;
- u32 GetState() const;
+ Stream::State GetStreamState() const;
private:
class VoiceState;
diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp
index ee4aa98af..742a5e0a0 100644
--- a/src/audio_core/stream.cpp
+++ b/src/audio_core/stream.cpp
@@ -53,8 +53,8 @@ void Stream::Stop() {
ASSERT_MSG(false, "Unimplemented");
}
-u32 Stream::GetState() const {
- return static_cast<u32>(state);
+Stream::State Stream::GetState() const {
+ return state;
}
s64 Stream::GetBufferReleaseCycles(const Buffer& buffer) const {
diff --git a/src/audio_core/stream.h b/src/audio_core/stream.h
index 43eca74e1..aebfeb51d 100644
--- a/src/audio_core/stream.h
+++ b/src/audio_core/stream.h
@@ -33,6 +33,12 @@ public:
Multi51Channel16,
};
+ /// Current state of the stream
+ enum class State {
+ Stopped,
+ Playing,
+ };
+
/// Callback function type, used to change guest state on a buffer being released
using ReleaseCallback = std::function<void()>;
@@ -73,15 +79,9 @@ public:
u32 GetNumChannels() const;
/// Get the state
- u32 GetState() const;
+ State GetState() const;
private:
- /// Current state of the stream
- enum class State {
- Stopped,
- Playing,
- };
-
/// Plays the next queued buffer in the audio stream, starting playback if necessary
void PlayNextBuffer();
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index 80ed4b152..1258de510 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -65,7 +65,7 @@ private:
void GetAudioRendererState(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
- rb.Push<u32>(renderer->GetState());
+ rb.Push<u32>(static_cast<u32>(renderer->GetStreamState()));
LOG_DEBUG(Service_Audio, "called");
}