summaryrefslogtreecommitdiff
path: root/servers/audio
diff options
context:
space:
mode:
authorMarcel Admiraal <madmiraal@users.noreply.github.com>2020-07-10 11:34:39 +0100
committerMarcel Admiraal <madmiraal@users.noreply.github.com>2020-07-10 13:56:54 +0100
commit26fcf2b04ca48566cee6cf32a2a40e8ea1e40eb4 (patch)
tree273aace3a50a8d14f9b13f1d991bb9048cef6131 /servers/audio
parentad9e5ae9848c8baf6fe462cf22d7f5677f478174 (diff)
Add override keywords.
Diffstat (limited to 'servers/audio')
-rw-r--r--servers/audio/audio_stream.h46
-rw-r--r--servers/audio/effects/audio_effect_amplify.h4
-rw-r--r--servers/audio/effects/audio_effect_chorus.h6
-rw-r--r--servers/audio/effects/audio_effect_compressor.h6
-rw-r--r--servers/audio/effects/audio_effect_delay.h4
-rw-r--r--servers/audio/effects/audio_effect_distortion.h4
-rw-r--r--servers/audio/effects/audio_effect_eq.h4
-rw-r--r--servers/audio/effects/audio_effect_filter.h10
-rw-r--r--servers/audio/effects/audio_effect_limiter.h4
-rw-r--r--servers/audio/effects/audio_effect_panner.h4
-rw-r--r--servers/audio/effects/audio_effect_phaser.h4
-rw-r--r--servers/audio/effects/audio_effect_pitch_shift.h4
-rw-r--r--servers/audio/effects/audio_effect_record.h6
-rw-r--r--servers/audio/effects/audio_effect_reverb.h4
-rw-r--r--servers/audio/effects/audio_effect_spectrum_analyzer.h4
-rw-r--r--servers/audio/effects/audio_effect_stereo_enhance.h4
-rw-r--r--servers/audio/effects/audio_stream_generator.h22
17 files changed, 70 insertions, 70 deletions
diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h
index fc66fd1ff7..9720196cc2 100644
--- a/servers/audio/audio_stream.h
+++ b/servers/audio/audio_stream.h
@@ -72,7 +72,7 @@ protected:
virtual float get_stream_sampling_rate() = 0;
public:
- virtual void mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames);
+ virtual void mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) override;
AudioStreamPlaybackResampled() { mix_offset = 0; }
};
@@ -105,10 +105,10 @@ protected:
static void _bind_methods();
public:
- virtual Ref<AudioStreamPlayback> instance_playback();
- virtual String get_stream_name() const;
+ virtual Ref<AudioStreamPlayback> instance_playback() override;
+ virtual String get_stream_name() const override;
- virtual float get_length() const; //if supported, otherwise return 0
+ virtual float get_length() const override; //if supported, otherwise return 0
AudioStreamMicrophone();
};
@@ -123,20 +123,20 @@ class AudioStreamPlaybackMicrophone : public AudioStreamPlaybackResampled {
Ref<AudioStreamMicrophone> microphone;
protected:
- virtual void _mix_internal(AudioFrame *p_buffer, int p_frames);
- virtual float get_stream_sampling_rate();
+ virtual void _mix_internal(AudioFrame *p_buffer, int p_frames) override;
+ virtual float get_stream_sampling_rate() override;
public:
- virtual void mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames);
+ virtual void mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) override;
- virtual void start(float p_from_pos = 0.0);
- virtual void stop();
- virtual bool is_playing() const;
+ virtual void start(float p_from_pos = 0.0) override;
+ virtual void stop() override;
+ virtual bool is_playing() const override;
- virtual int get_loop_count() const; //times it looped
+ virtual int get_loop_count() const override; //times it looped
- virtual float get_playback_position() const;
- virtual void seek(float p_time);
+ virtual float get_playback_position() const override;
+ virtual void seek(float p_time) override;
~AudioStreamPlaybackMicrophone();
AudioStreamPlaybackMicrophone();
@@ -164,10 +164,10 @@ public:
void set_random_pitch(float p_pitch);
float get_random_pitch() const;
- virtual Ref<AudioStreamPlayback> instance_playback();
- virtual String get_stream_name() const;
+ virtual Ref<AudioStreamPlayback> instance_playback() override;
+ virtual String get_stream_name() const override;
- virtual float get_length() const; //if supported, otherwise return 0
+ virtual float get_length() const override; //if supported, otherwise return 0
AudioStreamRandomPitch();
};
@@ -182,16 +182,16 @@ class AudioStreamPlaybackRandomPitch : public AudioStreamPlayback {
float pitch_scale;
public:
- virtual void start(float p_from_pos = 0.0);
- virtual void stop();
- virtual bool is_playing() const;
+ virtual void start(float p_from_pos = 0.0) override;
+ virtual void stop() override;
+ virtual bool is_playing() const override;
- virtual int get_loop_count() const; //times it looped
+ virtual int get_loop_count() const override; //times it looped
- virtual float get_playback_position() const;
- virtual void seek(float p_time);
+ virtual float get_playback_position() const override;
+ virtual void seek(float p_time) override;
- virtual void mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames);
+ virtual void mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) override;
~AudioStreamPlaybackRandomPitch();
};
diff --git a/servers/audio/effects/audio_effect_amplify.h b/servers/audio/effects/audio_effect_amplify.h
index 06e64ca3ce..7245bbdcbe 100644
--- a/servers/audio/effects/audio_effect_amplify.h
+++ b/servers/audio/effects/audio_effect_amplify.h
@@ -43,7 +43,7 @@ class AudioEffectAmplifyInstance : public AudioEffectInstance {
float mix_volume_db;
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectAmplify : public AudioEffect {
@@ -56,7 +56,7 @@ protected:
static void _bind_methods();
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_volume_db(float p_volume);
float get_volume_db() const;
diff --git a/servers/audio/effects/audio_effect_chorus.h b/servers/audio/effects/audio_effect_chorus.h
index 4d15c518d6..81af948530 100644
--- a/servers/audio/effects/audio_effect_chorus.h
+++ b/servers/audio/effects/audio_effect_chorus.h
@@ -50,7 +50,7 @@ class AudioEffectChorusInstance : public AudioEffectInstance {
void _process_chunk(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectChorus : public AudioEffect {
@@ -97,7 +97,7 @@ private:
float dry;
protected:
- void _validate_property(PropertyInfo &property) const;
+ void _validate_property(PropertyInfo &property) const override;
static void _bind_methods();
@@ -129,7 +129,7 @@ public:
void set_dry(float amount);
float get_dry() const;
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
AudioEffectChorus();
};
diff --git a/servers/audio/effects/audio_effect_compressor.h b/servers/audio/effects/audio_effect_compressor.h
index 2882f2e452..be187605c5 100644
--- a/servers/audio/effects/audio_effect_compressor.h
+++ b/servers/audio/effects/audio_effect_compressor.h
@@ -45,7 +45,7 @@ class AudioEffectCompressorInstance : public AudioEffectInstance {
public:
void set_current_channel(int p_channel) { current_channel = p_channel; }
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectCompressor : public AudioEffect {
@@ -61,11 +61,11 @@ class AudioEffectCompressor : public AudioEffect {
StringName sidechain;
protected:
- void _validate_property(PropertyInfo &property) const;
+ void _validate_property(PropertyInfo &property) const override;
static void _bind_methods();
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_threshold(float p_threshold);
float get_threshold() const;
diff --git a/servers/audio/effects/audio_effect_delay.h b/servers/audio/effects/audio_effect_delay.h
index 595793488c..a55000af4b 100644
--- a/servers/audio/effects/audio_effect_delay.h
+++ b/servers/audio/effects/audio_effect_delay.h
@@ -54,7 +54,7 @@ class AudioEffectDelayInstance : public AudioEffectInstance {
void _process_chunk(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectDelay : public AudioEffect {
@@ -127,7 +127,7 @@ public:
void set_feedback_lowpass(float p_lowpass);
float get_feedback_lowpass() const;
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
AudioEffectDelay();
};
diff --git a/servers/audio/effects/audio_effect_distortion.h b/servers/audio/effects/audio_effect_distortion.h
index e92334b3b8..8149fc3f0a 100644
--- a/servers/audio/effects/audio_effect_distortion.h
+++ b/servers/audio/effects/audio_effect_distortion.h
@@ -42,7 +42,7 @@ class AudioEffectDistortionInstance : public AudioEffectInstance {
float h[2];
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectDistortion : public AudioEffect {
@@ -68,7 +68,7 @@ protected:
static void _bind_methods();
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_mode(Mode p_mode);
Mode get_mode() const;
diff --git a/servers/audio/effects/audio_effect_eq.h b/servers/audio/effects/audio_effect_eq.h
index 7551b85e95..5a639f64d4 100644
--- a/servers/audio/effects/audio_effect_eq.h
+++ b/servers/audio/effects/audio_effect_eq.h
@@ -45,7 +45,7 @@ class AudioEffectEQInstance : public AudioEffectInstance {
Vector<float> gains;
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectEQ : public AudioEffect {
@@ -66,7 +66,7 @@ protected:
static void _bind_methods();
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_band_gain_db(int p_band, float p_volume);
float get_band_gain_db(int p_band) const;
int get_band_count() const;
diff --git a/servers/audio/effects/audio_effect_filter.h b/servers/audio/effects/audio_effect_filter.h
index b11a4e3623..16940173ba 100644
--- a/servers/audio/effects/audio_effect_filter.h
+++ b/servers/audio/effects/audio_effect_filter.h
@@ -49,7 +49,7 @@ class AudioEffectFilterInstance : public AudioEffectInstance {
void _process_filter(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
AudioEffectFilterInstance();
};
@@ -88,7 +88,7 @@ public:
void set_db(FilterDB p_db);
FilterDB get_db() const;
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
AudioEffectFilter(AudioFilterSW::Mode p_mode = AudioFilterSW::LOWPASS);
};
@@ -98,7 +98,7 @@ VARIANT_ENUM_CAST(AudioEffectFilter::FilterDB)
class AudioEffectLowPassFilter : public AudioEffectFilter {
GDCLASS(AudioEffectLowPassFilter, AudioEffectFilter);
- void _validate_property(PropertyInfo &property) const {
+ void _validate_property(PropertyInfo &property) const override {
if (property.name == "gain") {
property.usage = 0;
}
@@ -111,7 +111,7 @@ public:
class AudioEffectHighPassFilter : public AudioEffectFilter {
GDCLASS(AudioEffectHighPassFilter, AudioEffectFilter);
- void _validate_property(PropertyInfo &property) const {
+ void _validate_property(PropertyInfo &property) const override {
if (property.name == "gain") {
property.usage = 0;
}
@@ -124,7 +124,7 @@ public:
class AudioEffectBandPassFilter : public AudioEffectFilter {
GDCLASS(AudioEffectBandPassFilter, AudioEffectFilter);
- void _validate_property(PropertyInfo &property) const {
+ void _validate_property(PropertyInfo &property) const override {
if (property.name == "gain") {
property.usage = 0;
}
diff --git a/servers/audio/effects/audio_effect_limiter.h b/servers/audio/effects/audio_effect_limiter.h
index 9bac78578e..5204c42759 100644
--- a/servers/audio/effects/audio_effect_limiter.h
+++ b/servers/audio/effects/audio_effect_limiter.h
@@ -43,7 +43,7 @@ class AudioEffectLimiterInstance : public AudioEffectInstance {
float mix_volume_db;
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectLimiter : public AudioEffect {
@@ -71,7 +71,7 @@ public:
void set_soft_clip_ratio(float p_soft_clip);
float get_soft_clip_ratio() const;
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_volume_db(float p_volume);
float get_volume_db() const;
diff --git a/servers/audio/effects/audio_effect_panner.h b/servers/audio/effects/audio_effect_panner.h
index 6e0eb226f5..b4aa7a58b9 100644
--- a/servers/audio/effects/audio_effect_panner.h
+++ b/servers/audio/effects/audio_effect_panner.h
@@ -41,7 +41,7 @@ class AudioEffectPannerInstance : public AudioEffectInstance {
Ref<AudioEffectPanner> base;
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectPanner : public AudioEffect {
@@ -54,7 +54,7 @@ protected:
static void _bind_methods();
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_pan(float p_cpanume);
float get_pan() const;
diff --git a/servers/audio/effects/audio_effect_phaser.h b/servers/audio/effects/audio_effect_phaser.h
index d071970b6a..dbf014dbac 100644
--- a/servers/audio/effects/audio_effect_phaser.h
+++ b/servers/audio/effects/audio_effect_phaser.h
@@ -66,7 +66,7 @@ class AudioEffectPhaserInstance : public AudioEffectInstance {
AllpassDelay allpass[2][6];
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectPhaser : public AudioEffect {
@@ -83,7 +83,7 @@ protected:
static void _bind_methods();
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_range_min_hz(float p_hz);
float get_range_min_hz() const;
diff --git a/servers/audio/effects/audio_effect_pitch_shift.h b/servers/audio/effects/audio_effect_pitch_shift.h
index 48f8e5dc39..0fa4de6b5b 100644
--- a/servers/audio/effects/audio_effect_pitch_shift.h
+++ b/servers/audio/effects/audio_effect_pitch_shift.h
@@ -80,7 +80,7 @@ class AudioEffectPitchShiftInstance : public AudioEffectInstance {
SMBPitchShift shift_r;
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
};
class AudioEffectPitchShift : public AudioEffect {
@@ -109,7 +109,7 @@ protected:
static void _bind_methods();
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_pitch_scale(float p_pitch_scale);
float get_pitch_scale() const;
diff --git a/servers/audio/effects/audio_effect_record.h b/servers/audio/effects/audio_effect_record.h
index 68d968c04b..55080539d3 100644
--- a/servers/audio/effects/audio_effect_record.h
+++ b/servers/audio/effects/audio_effect_record.h
@@ -68,8 +68,8 @@ class AudioEffectRecordInstance : public AudioEffectInstance {
public:
void init();
void finish();
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
- virtual bool process_silence() const;
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
+ virtual bool process_silence() const override;
AudioEffectRecordInstance() {}
~AudioEffectRecordInstance();
@@ -96,7 +96,7 @@ protected:
static void debug(uint64_t time_diff, int p_frame_count);
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_recording_active(bool p_record);
bool is_recording_active() const;
void set_format(AudioStreamSample::Format p_format);
diff --git a/servers/audio/effects/audio_effect_reverb.h b/servers/audio/effects/audio_effect_reverb.h
index 6a34bc63c5..3a1922bc1d 100644
--- a/servers/audio/effects/audio_effect_reverb.h
+++ b/servers/audio/effects/audio_effect_reverb.h
@@ -49,7 +49,7 @@ class AudioEffectReverbInstance : public AudioEffectInstance {
Reverb reverb[2];
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
AudioEffectReverbInstance();
};
@@ -89,7 +89,7 @@ public:
float get_wet() const;
float get_hpf() const;
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_volume_db(float p_volume);
float get_volume_db() const;
diff --git a/servers/audio/effects/audio_effect_spectrum_analyzer.h b/servers/audio/effects/audio_effect_spectrum_analyzer.h
index a110f7a8e5..0eacd43b57 100644
--- a/servers/audio/effects/audio_effect_spectrum_analyzer.h
+++ b/servers/audio/effects/audio_effect_spectrum_analyzer.h
@@ -61,7 +61,7 @@ protected:
static void _bind_methods();
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
Vector2 get_magnitude_for_frequency_range(float p_begin, float p_end, MagnitudeMode p_mode = MAGNITUDE_MAX) const;
};
@@ -90,7 +90,7 @@ protected:
static void _bind_methods();
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_buffer_length(float p_seconds);
float get_buffer_length() const;
void set_tap_back_pos(float p_seconds);
diff --git a/servers/audio/effects/audio_effect_stereo_enhance.h b/servers/audio/effects/audio_effect_stereo_enhance.h
index c801049283..7fb32bd8ec 100644
--- a/servers/audio/effects/audio_effect_stereo_enhance.h
+++ b/servers/audio/effects/audio_effect_stereo_enhance.h
@@ -50,7 +50,7 @@ class AudioEffectStereoEnhanceInstance : public AudioEffectInstance {
unsigned int ringbuff_mask;
public:
- virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
+ virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
~AudioEffectStereoEnhanceInstance();
};
@@ -69,7 +69,7 @@ protected:
static void _bind_methods();
public:
- Ref<AudioEffectInstance> instance();
+ Ref<AudioEffectInstance> instance() override;
void set_pan_pullout(float p_amount);
float get_pan_pullout() const;
diff --git a/servers/audio/effects/audio_stream_generator.h b/servers/audio/effects/audio_stream_generator.h
index 763d913684..c90983a66f 100644
--- a/servers/audio/effects/audio_stream_generator.h
+++ b/servers/audio/effects/audio_stream_generator.h
@@ -50,10 +50,10 @@ public:
void set_buffer_length(float p_seconds);
float get_buffer_length() const;
- virtual Ref<AudioStreamPlayback> instance_playback();
- virtual String get_stream_name() const;
+ virtual Ref<AudioStreamPlayback> instance_playback() override;
+ virtual String get_stream_name() const override;
- virtual float get_length() const;
+ virtual float get_length() const override;
AudioStreamGenerator();
};
@@ -67,20 +67,20 @@ class AudioStreamGeneratorPlayback : public AudioStreamPlaybackResampled {
AudioStreamGenerator *generator;
protected:
- virtual void _mix_internal(AudioFrame *p_buffer, int p_frames);
- virtual float get_stream_sampling_rate();
+ virtual void _mix_internal(AudioFrame *p_buffer, int p_frames) override;
+ virtual float get_stream_sampling_rate() override;
static void _bind_methods();
public:
- virtual void start(float p_from_pos = 0.0);
- virtual void stop();
- virtual bool is_playing() const;
+ virtual void start(float p_from_pos = 0.0) override;
+ virtual void stop() override;
+ virtual bool is_playing() const override;
- virtual int get_loop_count() const; //times it looped
+ virtual int get_loop_count() const override; //times it looped
- virtual float get_playback_position() const;
- virtual void seek(float p_time);
+ virtual float get_playback_position() const override;
+ virtual void seek(float p_time) override;
bool push_frame(const Vector2 &p_frame);
bool can_push_buffer(int p_frames) const;