From 4808c7ef394ff130400a1a0be42f26efa8e953eb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 15 Jan 2013 20:18:54 +0100 Subject: encoder/{Vorbis,Opus}: use new/delete --- src/encoder/OpusEncoderPlugin.cxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/encoder/OpusEncoderPlugin.cxx') diff --git a/src/encoder/OpusEncoderPlugin.cxx b/src/encoder/OpusEncoderPlugin.cxx index 9f46e8681..53d16a8e4 100644 --- a/src/encoder/OpusEncoderPlugin.cxx +++ b/src/encoder/OpusEncoderPlugin.cxx @@ -67,6 +67,10 @@ struct opus_encoder { ogg_int64_t packetno; ogg_int64_t granulepos; + + opus_encoder() { + encoder_struct_init(&encoder, &opus_encoder_plugin); + } }; gcc_const @@ -123,15 +127,12 @@ opus_encoder_configure(struct opus_encoder *encoder, static struct encoder * opus_encoder_init(const struct config_param *param, GError **error) { - struct opus_encoder *encoder; - - encoder = g_new(struct opus_encoder, 1); - encoder_struct_init(&encoder->encoder, &opus_encoder_plugin); + opus_encoder *encoder = new opus_encoder(); /* load configuration from "param" */ if (!opus_encoder_configure(encoder, param, error)) { /* configuration has failed, roll back and return error */ - g_free(encoder); + delete encoder; return NULL; } @@ -145,7 +146,7 @@ opus_encoder_finish(struct encoder *_encoder) /* the real libopus cleanup was already performed by opus_encoder_close(), so no real work here */ - g_free(encoder); + delete encoder; } static bool -- cgit v1.2.3