godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the audio FFT_Size enum to FFTSize for consistency

Browse Source
This commit is contained in:
Hugo Locurcio 2021-05-13 02:42:49 +02:00
parent b283447bfd
commit 5895479a5e
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/classes/AudioEffectPitchShift.xml
View File

@ -12,7 +12,7 @@
<methods> <methods>
</methods> </methods>
<members> <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>
<member name="oversampling" type="int" setter="set_oversampling" getter="get_oversampling" default="4"> <member name="oversampling" type="int" setter="set_oversampling" getter="get_oversampling" default="4">
</member> </member>
@ -21,18 +21,18 @@
</member> </member>
</members> </members>
<constants> <constants>
<constant name="FFT_SIZE_256" value="0" enum="FFT_Size"> <constant name="FFT_SIZE_256" value="0" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_512" value="1" enum="FFT_Size"> <constant name="FFT_SIZE_512" value="1" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_1024" value="2" enum="FFT_Size"> <constant name="FFT_SIZE_1024" value="2" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_2048" value="3" enum="FFT_Size"> <constant name="FFT_SIZE_2048" value="3" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_4096" value="4" enum="FFT_Size"> <constant name="FFT_SIZE_4096" value="4" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_MAX" value="5" enum="FFT_Size"> <constant name="FFT_SIZE_MAX" value="5" enum="FFTSize">
Represents the size of the [enum FFT_Size] enum. Represents the size of the [enum FFTSize] enum.
</constant> </constant>
</constants> </constants>
</class> </class>

16
doc/classes/AudioEffectSpectrumAnalyzer.xml
View File

@ -11,24 +11,24 @@
<members> <members>
<member name="buffer_length" type="float" setter="set_buffer_length" getter="get_buffer_length" default="2.0"> <member name="buffer_length" type="float" setter="set_buffer_length" getter="get_buffer_length" default="2.0">
</member> </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>
<member name="tap_back_pos" type="float" setter="set_tap_back_pos" getter="get_tap_back_pos" default="0.01"> <member name="tap_back_pos" type="float" setter="set_tap_back_pos" getter="get_tap_back_pos" default="0.01">
</member> </member>
</members> </members>
<constants> <constants>
<constant name="FFT_SIZE_256" value="0" enum="FFT_Size"> <constant name="FFT_SIZE_256" value="0" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_512" value="1" enum="FFT_Size"> <constant name="FFT_SIZE_512" value="1" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_1024" value="2" enum="FFT_Size"> <constant name="FFT_SIZE_1024" value="2" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_2048" value="3" enum="FFT_Size"> <constant name="FFT_SIZE_2048" value="3" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_4096" value="4" enum="FFT_Size"> <constant name="FFT_SIZE_4096" value="4" enum="FFTSize">
</constant> </constant>
<constant name="FFT_SIZE_MAX" value="5" enum="FFT_Size"> <constant name="FFT_SIZE_MAX" value="5" enum="FFTSize">
Represents the size of the [enum FFT_Size] enum. Represents the size of the [enum FFTSize] enum.
</constant> </constant>
</constants> </constants>
</class> </class>

4
servers/audio/effects/audio_effect_pitch_shift.cpp
View File

@ -326,12 +326,12 @@ int AudioEffectPitchShift::get_oversampling() const {
return oversampling; 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); ERR_FAIL_INDEX(p_fft_size, FFT_SIZE_MAX);
fft_size = p_fft_size; fft_size = p_fft_size;
} }
AudioEffectPitchShift::FFT_Size AudioEffectPitchShift::get_fft_size() const { AudioEffectPitchShift::FFTSize AudioEffectPitchShift::get_fft_size() const {
return fft_size; return fft_size;
} }

10
servers/audio/effects/audio_effect_pitch_shift.h
View File

@ -89,7 +89,7 @@ class AudioEffectPitchShift : public AudioEffect {
public: public:
friend class AudioEffectPitchShiftInstance; friend class AudioEffectPitchShiftInstance;
enum FFT_Size { enum FFTSize {
FFT_SIZE_256, FFT_SIZE_256,
FFT_SIZE_512, FFT_SIZE_512,
FFT_SIZE_1024, FFT_SIZE_1024,
@ -100,7 +100,7 @@ public:
float pitch_scale; float pitch_scale;
int oversampling; int oversampling;
FFT_Size fft_size; FFTSize fft_size;
float wet; float wet;
float dry; float dry;
bool filter; bool filter;
@ -117,12 +117,12 @@ public:
void set_oversampling(int p_oversampling); void set_oversampling(int p_oversampling);
int get_oversampling() const; int get_oversampling() const;
void set_fft_size(FFT_Size); void set_fft_size(FFTSize);
FFT_Size get_fft_size() const; FFTSize get_fft_size() const;
AudioEffectPitchShift(); AudioEffectPitchShift();
}; };
VARIANT_ENUM_CAST(AudioEffectPitchShift::FFT_Size); VARIANT_ENUM_CAST(AudioEffectPitchShift::FFTSize);
#endif // AUDIO_EFFECT_PITCH_SHIFT_H #endif // AUDIO_EFFECT_PITCH_SHIFT_H

4
servers/audio/effects/audio_effect_spectrum_analyzer.cpp
View File

@ -245,12 +245,12 @@ float AudioEffectSpectrumAnalyzer::get_tap_back_pos() const {
return tapback_pos; 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); ERR_FAIL_INDEX(p_fft_size, FFT_SIZE_MAX);
fft_size = p_fft_size; fft_size = p_fft_size;
} }
AudioEffectSpectrumAnalyzer::FFT_Size AudioEffectSpectrumAnalyzer::get_fft_size() const { AudioEffectSpectrumAnalyzer::FFTSize AudioEffectSpectrumAnalyzer::get_fft_size() const {
return fft_size; return fft_size;
} }

10
servers/audio/effects/audio_effect_spectrum_analyzer.h
View File

@ -71,7 +71,7 @@ class AudioEffectSpectrumAnalyzer : public AudioEffect {
GDCLASS(AudioEffectSpectrumAnalyzer, AudioEffect); GDCLASS(AudioEffectSpectrumAnalyzer, AudioEffect);
public: public:
enum FFT_Size { enum FFTSize {
FFT_SIZE_256, FFT_SIZE_256,
FFT_SIZE_512, FFT_SIZE_512,
FFT_SIZE_1024, FFT_SIZE_1024,
@ -84,7 +84,7 @@ public:
friend class AudioEffectSpectrumAnalyzerInstance; friend class AudioEffectSpectrumAnalyzerInstance;
float buffer_length; float buffer_length;
float tapback_pos; float tapback_pos;
FFT_Size fft_size; FFTSize fft_size;
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -96,12 +96,12 @@ public:
void set_tap_back_pos(float p_seconds); void set_tap_back_pos(float p_seconds);
float get_tap_back_pos() const; float get_tap_back_pos() const;
void set_fft_size(FFT_Size); void set_fft_size(FFTSize);
FFT_Size get_fft_size() const; FFTSize get_fft_size() const;
AudioEffectSpectrumAnalyzer(); AudioEffectSpectrumAnalyzer();
}; };
VARIANT_ENUM_CAST(AudioEffectSpectrumAnalyzer::FFT_Size); VARIANT_ENUM_CAST(AudioEffectSpectrumAnalyzer::FFTSize);
#endif // AUDIO_EFFECT_SPECTRUM_ANALYZER_H #endif // AUDIO_EFFECT_SPECTRUM_ANALYZER_H