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

decoder/Thread: move decoder_command_finished_locked() to DecoderControl

Browse Source
This commit is contained in:
Max Kellermann
2015-12-31 13:06:31 +01:00
parent f081696f62
commit 6507993972
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/decoder/DecoderControl.hxx
View File

@@ -350,6 +350,20 @@ private:
} }
public: public:
/**
* Marks the current command as "finished" and notifies the
* client (= player thread).
*
* To be called from the decoder thread. Caller must lock the
* mutex.
*/
void CommandFinishedLocked() {
assert(command != DecoderCommand::NONE);
command = DecoderCommand::NONE;
client_cond.signal();
}
/** /**
* Start the decoder. * Start the decoder.
* *

23
src/decoder/DecoderThread.cxx
View File

@@ -44,22 +44,6 @@
static constexpr Domain decoder_thread_domain("decoder_thread"); static constexpr Domain decoder_thread_domain("decoder_thread");
/**
* Marks the current decoder command as "finished" and notifies the
* player thread.
*
* @param dc the #DecoderControl object; must be locked
*/
static void
decoder_command_finished_locked(DecoderControl &dc)
{
assert(dc.command != DecoderCommand::NONE);
dc.command = DecoderCommand::NONE;
dc.client_cond.signal();
}
/** /**
* Opens the input stream with InputStream::Open(), and waits until * Opens the input stream with InputStream::Open(), and waits until
* the stream gets ready. If a decoder STOP command is received * the stream gets ready. If a decoder STOP command is received
@@ -382,8 +366,7 @@ decoder_run_song(DecoderControl &dc,
song.IsFile() ? new Tag(song.GetTag()) : nullptr); song.IsFile() ? new Tag(song.GetTag()) : nullptr);
dc.state = DecoderState::START; dc.state = DecoderState::START;
dc.CommandFinishedLocked();
decoder_command_finished_locked(dc);
bool success; bool success;
{ {
@@ -441,7 +424,7 @@ decoder_run(DecoderControl &dc)
path_buffer = AllocatedPath::FromUTF8(uri_utf8, dc.error); path_buffer = AllocatedPath::FromUTF8(uri_utf8, dc.error);
if (path_buffer.IsNull()) { if (path_buffer.IsNull()) {
dc.state = DecoderState::ERROR; dc.state = DecoderState::ERROR;
decoder_command_finished_locked(dc); dc.CommandFinishedLocked();
return; return;
} }
@@ -487,7 +470,7 @@ decoder_task(void *arg)
break; break;
case DecoderCommand::STOP: case DecoderCommand::STOP:
decoder_command_finished_locked(dc); dc.CommandFinishedLocked();
break; break;
case DecoderCommand::NONE: case DecoderCommand::NONE: