diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_core/effect_context.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/audio_core/effect_context.h b/src/audio_core/effect_context.h index 2f2da72dd..c2d2aa3ba 100644 --- a/src/audio_core/effect_context.h +++ b/src/audio_core/effect_context.h | |||
| @@ -166,13 +166,13 @@ public: | |||
| 166 | std::array<u8, 0xa0> raw; | 166 | std::array<u8, 0xa0> raw; |
| 167 | }; | 167 | }; |
| 168 | }; | 168 | }; |
| 169 | static_assert(sizeof(EffectInfo::InParams) == 0xc0, "InParams is an invalid size"); | 169 | static_assert(sizeof(InParams) == 0xc0, "InParams is an invalid size"); |
| 170 | 170 | ||
| 171 | struct OutParams { | 171 | struct OutParams { |
| 172 | UsageStatus status{}; | 172 | UsageStatus status{}; |
| 173 | INSERT_PADDING_BYTES(15); | 173 | INSERT_PADDING_BYTES(15); |
| 174 | }; | 174 | }; |
| 175 | static_assert(sizeof(EffectInfo::OutParams) == 0x10, "OutParams is an invalid size"); | 175 | static_assert(sizeof(OutParams) == 0x10, "OutParams is an invalid size"); |
| 176 | }; | 176 | }; |
| 177 | 177 | ||
| 178 | struct AuxAddress { | 178 | struct AuxAddress { |
| @@ -184,8 +184,8 @@ struct AuxAddress { | |||
| 184 | 184 | ||
| 185 | class EffectBase { | 185 | class EffectBase { |
| 186 | public: | 186 | public: |
| 187 | EffectBase(EffectType effect_type); | 187 | explicit EffectBase(EffectType effect_type); |
| 188 | ~EffectBase(); | 188 | virtual ~EffectBase(); |
| 189 | 189 | ||
| 190 | virtual void Update(EffectInfo::InParams& in_params) = 0; | 190 | virtual void Update(EffectInfo::InParams& in_params) = 0; |
| 191 | virtual void UpdateForCommandGeneration() = 0; | 191 | virtual void UpdateForCommandGeneration() = 0; |
| @@ -206,8 +206,7 @@ protected: | |||
| 206 | template <typename T> | 206 | template <typename T> |
| 207 | class EffectGeneric : public EffectBase { | 207 | class EffectGeneric : public EffectBase { |
| 208 | public: | 208 | public: |
| 209 | EffectGeneric(EffectType effect_type) : EffectBase::EffectBase(effect_type) {} | 209 | explicit EffectGeneric(EffectType effect_type) : EffectBase(effect_type) {} |
| 210 | ~EffectGeneric() = default; | ||
| 211 | 210 | ||
| 212 | T& GetParams() { | 211 | T& GetParams() { |
| 213 | return internal_params; | 212 | return internal_params; |
| @@ -224,7 +223,7 @@ private: | |||
| 224 | class EffectStubbed : public EffectBase { | 223 | class EffectStubbed : public EffectBase { |
| 225 | public: | 224 | public: |
| 226 | explicit EffectStubbed(); | 225 | explicit EffectStubbed(); |
| 227 | ~EffectStubbed(); | 226 | ~EffectStubbed() override; |
| 228 | 227 | ||
| 229 | void Update(EffectInfo::InParams& in_params) override; | 228 | void Update(EffectInfo::InParams& in_params) override; |
| 230 | void UpdateForCommandGeneration() override; | 229 | void UpdateForCommandGeneration() override; |
| @@ -233,7 +232,7 @@ public: | |||
| 233 | class EffectI3dl2Reverb : public EffectGeneric<I3dl2ReverbParams> { | 232 | class EffectI3dl2Reverb : public EffectGeneric<I3dl2ReverbParams> { |
| 234 | public: | 233 | public: |
| 235 | explicit EffectI3dl2Reverb(); | 234 | explicit EffectI3dl2Reverb(); |
| 236 | ~EffectI3dl2Reverb(); | 235 | ~EffectI3dl2Reverb() override; |
| 237 | 236 | ||
| 238 | void Update(EffectInfo::InParams& in_params) override; | 237 | void Update(EffectInfo::InParams& in_params) override; |
| 239 | void UpdateForCommandGeneration() override; | 238 | void UpdateForCommandGeneration() override; |
| @@ -245,7 +244,7 @@ private: | |||
| 245 | class EffectBiquadFilter : public EffectGeneric<BiquadFilterParams> { | 244 | class EffectBiquadFilter : public EffectGeneric<BiquadFilterParams> { |
| 246 | public: | 245 | public: |
| 247 | explicit EffectBiquadFilter(); | 246 | explicit EffectBiquadFilter(); |
| 248 | ~EffectBiquadFilter(); | 247 | ~EffectBiquadFilter() override; |
| 249 | 248 | ||
| 250 | void Update(EffectInfo::InParams& in_params) override; | 249 | void Update(EffectInfo::InParams& in_params) override; |
| 251 | void UpdateForCommandGeneration() override; | 250 | void UpdateForCommandGeneration() override; |
| @@ -254,7 +253,7 @@ public: | |||
| 254 | class EffectAuxInfo : public EffectGeneric<AuxInfo> { | 253 | class EffectAuxInfo : public EffectGeneric<AuxInfo> { |
| 255 | public: | 254 | public: |
| 256 | explicit EffectAuxInfo(); | 255 | explicit EffectAuxInfo(); |
| 257 | ~EffectAuxInfo(); | 256 | ~EffectAuxInfo() override; |
| 258 | 257 | ||
| 259 | void Update(EffectInfo::InParams& in_params) override; | 258 | void Update(EffectInfo::InParams& in_params) override; |
| 260 | void UpdateForCommandGeneration() override; | 259 | void UpdateForCommandGeneration() override; |
| @@ -275,7 +274,7 @@ private: | |||
| 275 | class EffectDelay : public EffectGeneric<DelayParams> { | 274 | class EffectDelay : public EffectGeneric<DelayParams> { |
| 276 | public: | 275 | public: |
| 277 | explicit EffectDelay(); | 276 | explicit EffectDelay(); |
| 278 | ~EffectDelay(); | 277 | ~EffectDelay() override; |
| 279 | 278 | ||
| 280 | void Update(EffectInfo::InParams& in_params) override; | 279 | void Update(EffectInfo::InParams& in_params) override; |
| 281 | void UpdateForCommandGeneration() override; | 280 | void UpdateForCommandGeneration() override; |
| @@ -287,7 +286,7 @@ private: | |||
| 287 | class EffectBufferMixer : public EffectGeneric<BufferMixerParams> { | 286 | class EffectBufferMixer : public EffectGeneric<BufferMixerParams> { |
| 288 | public: | 287 | public: |
| 289 | explicit EffectBufferMixer(); | 288 | explicit EffectBufferMixer(); |
| 290 | ~EffectBufferMixer(); | 289 | ~EffectBufferMixer() override; |
| 291 | 290 | ||
| 292 | void Update(EffectInfo::InParams& in_params) override; | 291 | void Update(EffectInfo::InParams& in_params) override; |
| 293 | void UpdateForCommandGeneration() override; | 292 | void UpdateForCommandGeneration() override; |
| @@ -296,7 +295,7 @@ public: | |||
| 296 | class EffectReverb : public EffectGeneric<ReverbParams> { | 295 | class EffectReverb : public EffectGeneric<ReverbParams> { |
| 297 | public: | 296 | public: |
| 298 | explicit EffectReverb(); | 297 | explicit EffectReverb(); |
| 299 | ~EffectReverb(); | 298 | ~EffectReverb() override; |
| 300 | 299 | ||
| 301 | void Update(EffectInfo::InParams& in_params) override; | 300 | void Update(EffectInfo::InParams& in_params) override; |
| 302 | void UpdateForCommandGeneration() override; | 301 | void UpdateForCommandGeneration() override; |