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

DecoderThread: move code to destructor

Browse Source
This commit is contained in:
Max Kellermann
2013-01-04 22:02:52 +01:00
parent ac6803e7b7
commit 7267558ba1
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/DecoderThread.cxx
View File

@@ -389,30 +389,17 @@ decoder_run_song(struct decoder_control *dc,
decoder_command_finished_locked(dc);
pcm_convert_init(&decoder.conv_state);
ret = song_is_file(song)
? decoder_run_file(&decoder, uri)
: decoder_run_stream(&decoder, uri);
decoder_unlock(dc);
pcm_convert_deinit(&decoder.conv_state);
/* flush the last chunk */
if (decoder.chunk != NULL)
decoder_flush_chunk(&decoder);
if (decoder.song_tag != NULL)
tag_free(decoder.song_tag);
if (decoder.stream_tag != NULL)
tag_free(decoder.stream_tag);
if (decoder.decoder_tag != NULL)
tag_free(decoder.decoder_tag);
decoder_lock(dc);
if (ret)