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

DecoderThread: make variables more local

Browse Source
This commit is contained in:
Max Kellermann
2015-01-31 22:20:38 +01:00
parent eb1733609a
commit ee6e0e16cb
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/decoder/DecoderThread.cxx
View File

@@ -267,12 +267,10 @@ static bool
decoder_run_stream(Decoder &decoder, const char *uri)
{
DecoderControl &dc = decoder.dc;
InputStream *input_stream;
bool success;
dc.Unlock();
input_stream = decoder_input_stream_open(dc, uri);
InputStream *input_stream = decoder_input_stream_open(dc, uri);
if (input_stream == nullptr) {
dc.Lock();
return false;
@@ -281,7 +279,7 @@ decoder_run_stream(Decoder &decoder, const char *uri)
dc.Lock();
bool tried = false;
success = dc.command == DecoderCommand::STOP ||
const bool success = dc.command == DecoderCommand::STOP ||
decoder_run_stream_locked(decoder, *input_stream, uri,
tried) ||
/* fallback to mp3: this is needed for bastard streams
@@ -381,13 +379,12 @@ decoder_run_song(DecoderControl &dc,
{
Decoder decoder(dc, dc.start_time.IsPositive(),
new Tag(song.GetTag()));
int ret;
dc.state = DecoderState::START;
decoder_command_finished_locked(dc);
ret = !path_fs.IsNull()
const int ret = !path_fs.IsNull()
? decoder_run_file(decoder, uri, path_fs)
: decoder_run_stream(decoder, uri);