summaryrefslogtreecommitdiffstats
path: root/src/audio_core/voice_context.h
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-11-25 21:21:03 +0100
committerLioncash <mathew1800@gmail.com>2020-12-03 06:54:31 +0100
commit1ea6bdef058a789e2771511f741bffcca73c3525 (patch)
tree6bcfaa3649add0bb73ff5bbcf982197439c896d1 /src/audio_core/voice_context.h
parentMerge pull request #4959 from Morph1984/emulated-controller-styleset (diff)
downloadyuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.gz
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.bz2
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.lz
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.xz
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.tar.zst
yuzu-1ea6bdef058a789e2771511f741bffcca73c3525.zip
Diffstat (limited to 'src/audio_core/voice_context.h')
-rw-r--r--src/audio_core/voice_context.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio_core/voice_context.h b/src/audio_core/voice_context.h
index 59d3d7dfb..863248761 100644
--- a/src/audio_core/voice_context.h
+++ b/src/audio_core/voice_context.h
@@ -118,12 +118,12 @@ public:
bool in_use{};
INSERT_PADDING_BYTES(11);
};
- static_assert(sizeof(VoiceChannelResource::InParams) == 0x70, "InParams is an invalid size");
+ static_assert(sizeof(InParams) == 0x70, "InParams is an invalid size");
};
class ServerVoiceChannelResource {
public:
- explicit ServerVoiceChannelResource(s32 id);
+ explicit ServerVoiceChannelResource(s32 id_);
~ServerVoiceChannelResource();
bool InUse() const;
@@ -174,7 +174,7 @@ public:
BehaviorFlags behavior_flags{};
INSERT_PADDING_BYTES(16);
};
- static_assert(sizeof(VoiceInfo::InParams) == 0x170, "InParams is an invalid size");
+ static_assert(sizeof(InParams) == 0x170, "InParams is an invalid size");
struct OutParams {
u64_le played_sample_count{};
@@ -182,7 +182,7 @@ public:
u8 voice_dropped{};
INSERT_PADDING_BYTES(3);
};
- static_assert(sizeof(VoiceInfo::OutParams) == 0x10, "OutParams is an invalid size");
+ static_assert(sizeof(OutParams) == 0x10, "OutParams is an invalid size");
};
class ServerVoiceInfo {
@@ -263,7 +263,7 @@ private:
class VoiceContext {
public:
- VoiceContext(std::size_t voice_count);
+ explicit VoiceContext(std::size_t voice_count_);
~VoiceContext();
std::size_t GetVoiceCount() const;