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

Add override keywords.

Browse Source
This commit is contained in:
Marcel Admiraal
2020-07-10 11:34:39 +01:00
parent ad9e5ae984
commit 26fcf2b04c
351 changed files with 4123 additions and 4146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
servers/audio/audio_stream.h
View File

@ -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();
};