From c5d05ac0cf18dbd3d04534de240c437f8b07bd28 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 27 Sep 2013 12:11:37 +0200 Subject: DecoderCommand: convert to strictly-typed enum --- src/decoder/FaadDecoderPlugin.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/decoder/FaadDecoderPlugin.cxx') diff --git a/src/decoder/FaadDecoderPlugin.cxx b/src/decoder/FaadDecoderPlugin.cxx index c8acfb521..f026a6216 100644 --- a/src/decoder/FaadDecoderPlugin.cxx +++ b/src/decoder/FaadDecoderPlugin.cxx @@ -368,7 +368,6 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is) bool ret; uint16_t bit_rate = 0; DecoderBuffer *buffer; - enum decoder_command cmd; buffer = decoder_buffer_new(mpd_decoder, is, FAAD_MIN_STREAMSIZE * AAC_MAX_CHANNELS); @@ -386,7 +385,7 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is) NeAACDecSetConfiguration(decoder, config); while (!decoder_buffer_is_full(buffer) && !is->LockIsEOF() && - decoder_get_command(mpd_decoder) == DECODE_COMMAND_NONE) { + decoder_get_command(mpd_decoder) == DecoderCommand::NONE) { adts_find_frame(buffer); decoder_buffer_fill(buffer); } @@ -407,6 +406,7 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is) /* the decoder loop */ + DecoderCommand cmd; do { size_t frame_size; const void *decoded; @@ -457,7 +457,7 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is) cmd = decoder_data(mpd_decoder, is, decoded, (size_t)frame_info.samples * 2, bit_rate); - } while (cmd != DECODE_COMMAND_STOP); + } while (cmd != DecoderCommand::STOP); /* cleanup */ -- cgit v1.2.3