Skip to content

Commit 1aba8ab

Browse files
committed
Merge pull request #118869 from DeeJayLSP/mp3-ogg-no-cd
Remove constructors from MP3 and Ogg Vorbis streams
2 parents eb098a2 + df4a211 commit 1aba8ab

4 files changed

Lines changed: 0 additions & 17 deletions

File tree

modules/mp3/audio_stream_mp3.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,3 @@ void AudioStreamMP3::_bind_methods() {
357357
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "loop"), "set_loop", "has_loop");
358358
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "loop_offset"), "set_loop_offset", "get_loop_offset");
359359
}
360-
361-
AudioStreamMP3::AudioStreamMP3() {
362-
}
363-
364-
AudioStreamMP3::~AudioStreamMP3() {
365-
clear_data();
366-
}

modules/mp3/audio_stream_mp3.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,4 @@ class AudioStreamMP3 : public AudioStream {
146146
virtual Ref<AudioSample> generate_sample() const override;
147147

148148
virtual void get_parameter_list(List<Parameter> *r_parameters) override;
149-
150-
AudioStreamMP3();
151-
virtual ~AudioStreamMP3();
152149
};

modules/vorbis/audio_stream_ogg_vorbis.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,3 @@ void AudioStreamOggVorbis::_bind_methods() {
737737
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "loop"), "set_loop", "has_loop");
738738
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "loop_offset"), "set_loop_offset", "get_loop_offset");
739739
}
740-
741-
AudioStreamOggVorbis::AudioStreamOggVorbis() {}
742-
743-
AudioStreamOggVorbis::~AudioStreamOggVorbis() {}

modules/vorbis/audio_stream_ogg_vorbis.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,4 @@ class AudioStreamOggVorbis : public AudioStream {
176176
return true;
177177
}
178178
virtual Ref<AudioSample> generate_sample() const override;
179-
180-
AudioStreamOggVorbis();
181-
virtual ~AudioStreamOggVorbis();
182179
};

0 commit comments

Comments
 (0)