oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

encoder/vorbis: merge Clear() into the destructor

Browse Source
This commit is contained in:
Max Kellermann 2016-05-09 13:22:27 +02:00
parent 215213fc2c
commit 80d2028bac
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/encoder/plugins/VorbisEncoderPlugin.cxx
View File

@ -42,7 +42,9 @@ public:
:OggEncoder(true) {} :OggEncoder(true) {}
virtual ~VorbisEncoder() { virtual ~VorbisEncoder() {
Clear(); vorbis_block_clear(&vb);
vorbis_dsp_clear(&vd);
vorbis_info_clear(&vi);
} }
bool Open(float quality, int bitrate, AudioFormat &audio_format, bool Open(float quality, int bitrate, AudioFormat &audio_format,
@ -62,7 +64,6 @@ private:
void HeaderOut(vorbis_comment &vc); void HeaderOut(vorbis_comment &vc);
void SendHeader(); void SendHeader();
void BlockOut(); void BlockOut();
void Clear();
}; };
class PreparedVorbisEncoder final : public PreparedEncoder { class PreparedVorbisEncoder final : public PreparedEncoder {
@ -219,14 +220,6 @@ PreparedVorbisEncoder::Open(AudioFormat &audio_format, Error &error)
return e; return e;
} }
void
VorbisEncoder::Clear()
{
vorbis_block_clear(&vb);
vorbis_dsp_clear(&vd);
vorbis_info_clear(&vi);
}
void void
VorbisEncoder::BlockOut() VorbisEncoder::BlockOut()
{ {