diff options
author | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2021-05-13 02:42:49 +0200 |
---|---|---|
committer | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2021-05-13 02:42:49 +0200 |
commit | 5895479a5e5f8b1b9bf48fda30644dc83394e252 (patch) | |
tree | 1a8c3486f6074ce86cd8a0e43d3524ae100e7103 | |
parent | b283447bfd5c8d1f6a6566bda57f89c1b87a3e0e (diff) |
Rename the audio `FFT_Size` enum to `FFTSize` for consistency
-rw-r--r-- | doc/classes/AudioEffectPitchShift.xml | 16 | ||||
-rw-r--r-- | doc/classes/AudioEffectSpectrumAnalyzer.xml | 16 | ||||
-rw-r--r-- | servers/audio/effects/audio_effect_pitch_shift.cpp | 4 | ||||
-rw-r--r-- | servers/audio/effects/audio_effect_pitch_shift.h | 10 | ||||
-rw-r--r-- | servers/audio/effects/audio_effect_spectrum_analyzer.cpp | 4 | ||||
-rw-r--r-- | servers/audio/effects/audio_effect_spectrum_analyzer.h | 10 |
6 files changed, 30 insertions, 30 deletions
diff --git a/doc/classes/AudioEffectPitchShift.xml b/doc/classes/AudioEffectPitchShift.xml index afe364de63..917556fded 100644 --- a/doc/classes/AudioEffectPitchShift.xml +++ b/doc/classes/AudioEffectPitchShift.xml @@ -12,7 +12,7 @@ <methods> </methods> <members> - <member name="fft_size" type="int" setter="set_fft_size" getter="get_fft_size" enum="AudioEffectPitchShift.FFT_Size" default="3"> + <member name="fft_size" type="int" setter="set_fft_size" getter="get_fft_size" enum="AudioEffectPitchShift.FFTSize" default="3"> </member> <member name="oversampling" type="int" setter="set_oversampling" getter="get_oversampling" default="4"> </member> @@ -21,18 +21,18 @@ </member> </members> <constants> - <constant name="FFT_SIZE_256" value="0" enum="FFT_Size"> + <constant name="FFT_SIZE_256" value="0" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_512" value="1" enum="FFT_Size"> + <constant name="FFT_SIZE_512" value="1" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_1024" value="2" enum="FFT_Size"> + <constant name="FFT_SIZE_1024" value="2" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_2048" value="3" enum="FFT_Size"> + <constant name="FFT_SIZE_2048" value="3" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_4096" value="4" enum="FFT_Size"> + <constant name="FFT_SIZE_4096" value="4" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_MAX" value="5" enum="FFT_Size"> - Represents the size of the [enum FFT_Size] enum. + <constant name="FFT_SIZE_MAX" value="5" enum="FFTSize"> + Represents the size of the [enum FFTSize] enum. </constant> </constants> </class> diff --git a/doc/classes/AudioEffectSpectrumAnalyzer.xml b/doc/classes/AudioEffectSpectrumAnalyzer.xml index 4c08b18f1d..79a8932e25 100644 --- a/doc/classes/AudioEffectSpectrumAnalyzer.xml +++ b/doc/classes/AudioEffectSpectrumAnalyzer.xml @@ -11,24 +11,24 @@ <members> <member name="buffer_length" type="float" setter="set_buffer_length" getter="get_buffer_length" default="2.0"> </member> - <member name="fft_size" type="int" setter="set_fft_size" getter="get_fft_size" enum="AudioEffectSpectrumAnalyzer.FFT_Size" default="2"> + <member name="fft_size" type="int" setter="set_fft_size" getter="get_fft_size" enum="AudioEffectSpectrumAnalyzer.FFTSize" default="2"> </member> <member name="tap_back_pos" type="float" setter="set_tap_back_pos" getter="get_tap_back_pos" default="0.01"> </member> </members> <constants> - <constant name="FFT_SIZE_256" value="0" enum="FFT_Size"> + <constant name="FFT_SIZE_256" value="0" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_512" value="1" enum="FFT_Size"> + <constant name="FFT_SIZE_512" value="1" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_1024" value="2" enum="FFT_Size"> + <constant name="FFT_SIZE_1024" value="2" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_2048" value="3" enum="FFT_Size"> + <constant name="FFT_SIZE_2048" value="3" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_4096" value="4" enum="FFT_Size"> + <constant name="FFT_SIZE_4096" value="4" enum="FFTSize"> </constant> - <constant name="FFT_SIZE_MAX" value="5" enum="FFT_Size"> - Represents the size of the [enum FFT_Size] enum. + <constant name="FFT_SIZE_MAX" value="5" enum="FFTSize"> + Represents the size of the [enum FFTSize] enum. </constant> </constants> </class> diff --git a/servers/audio/effects/audio_effect_pitch_shift.cpp b/servers/audio/effects/audio_effect_pitch_shift.cpp index 2123fe8548..7b0151b9c1 100644 --- a/servers/audio/effects/audio_effect_pitch_shift.cpp +++ b/servers/audio/effects/audio_effect_pitch_shift.cpp @@ -326,12 +326,12 @@ int AudioEffectPitchShift::get_oversampling() const { return oversampling; } -void AudioEffectPitchShift::set_fft_size(FFT_Size p_fft_size) { +void AudioEffectPitchShift::set_fft_size(FFTSize p_fft_size) { ERR_FAIL_INDEX(p_fft_size, FFT_SIZE_MAX); fft_size = p_fft_size; } -AudioEffectPitchShift::FFT_Size AudioEffectPitchShift::get_fft_size() const { +AudioEffectPitchShift::FFTSize AudioEffectPitchShift::get_fft_size() const { return fft_size; } diff --git a/servers/audio/effects/audio_effect_pitch_shift.h b/servers/audio/effects/audio_effect_pitch_shift.h index 18a9c33968..669943fa43 100644 --- a/servers/audio/effects/audio_effect_pitch_shift.h +++ b/servers/audio/effects/audio_effect_pitch_shift.h @@ -89,7 +89,7 @@ class AudioEffectPitchShift : public AudioEffect { public: friend class AudioEffectPitchShiftInstance; - enum FFT_Size { + enum FFTSize { FFT_SIZE_256, FFT_SIZE_512, FFT_SIZE_1024, @@ -100,7 +100,7 @@ public: float pitch_scale; int oversampling; - FFT_Size fft_size; + FFTSize fft_size; float wet; float dry; bool filter; @@ -117,12 +117,12 @@ public: void set_oversampling(int p_oversampling); int get_oversampling() const; - void set_fft_size(FFT_Size); - FFT_Size get_fft_size() const; + void set_fft_size(FFTSize); + FFTSize get_fft_size() const; AudioEffectPitchShift(); }; -VARIANT_ENUM_CAST(AudioEffectPitchShift::FFT_Size); +VARIANT_ENUM_CAST(AudioEffectPitchShift::FFTSize); #endif // AUDIO_EFFECT_PITCH_SHIFT_H diff --git a/servers/audio/effects/audio_effect_spectrum_analyzer.cpp b/servers/audio/effects/audio_effect_spectrum_analyzer.cpp index 3f7ab74a74..44b7f64d52 100644 --- a/servers/audio/effects/audio_effect_spectrum_analyzer.cpp +++ b/servers/audio/effects/audio_effect_spectrum_analyzer.cpp @@ -245,12 +245,12 @@ float AudioEffectSpectrumAnalyzer::get_tap_back_pos() const { return tapback_pos; } -void AudioEffectSpectrumAnalyzer::set_fft_size(FFT_Size p_fft_size) { +void AudioEffectSpectrumAnalyzer::set_fft_size(FFTSize p_fft_size) { ERR_FAIL_INDEX(p_fft_size, FFT_SIZE_MAX); fft_size = p_fft_size; } -AudioEffectSpectrumAnalyzer::FFT_Size AudioEffectSpectrumAnalyzer::get_fft_size() const { +AudioEffectSpectrumAnalyzer::FFTSize AudioEffectSpectrumAnalyzer::get_fft_size() const { return fft_size; } diff --git a/servers/audio/effects/audio_effect_spectrum_analyzer.h b/servers/audio/effects/audio_effect_spectrum_analyzer.h index fba276e2bb..fc275446f0 100644 --- a/servers/audio/effects/audio_effect_spectrum_analyzer.h +++ b/servers/audio/effects/audio_effect_spectrum_analyzer.h @@ -71,7 +71,7 @@ class AudioEffectSpectrumAnalyzer : public AudioEffect { GDCLASS(AudioEffectSpectrumAnalyzer, AudioEffect); public: - enum FFT_Size { + enum FFTSize { FFT_SIZE_256, FFT_SIZE_512, FFT_SIZE_1024, @@ -84,7 +84,7 @@ public: friend class AudioEffectSpectrumAnalyzerInstance; float buffer_length; float tapback_pos; - FFT_Size fft_size; + FFTSize fft_size; protected: static void _bind_methods(); @@ -96,12 +96,12 @@ public: void set_tap_back_pos(float p_seconds); float get_tap_back_pos() const; - void set_fft_size(FFT_Size); - FFT_Size get_fft_size() const; + void set_fft_size(FFTSize); + FFTSize get_fft_size() const; AudioEffectSpectrumAnalyzer(); }; -VARIANT_ENUM_CAST(AudioEffectSpectrumAnalyzer::FFT_Size); +VARIANT_ENUM_CAST(AudioEffectSpectrumAnalyzer::FFTSize); #endif // AUDIO_EFFECT_SPECTRUM_ANALYZER_H |