added decoder_command_finished() to decoder_api.h
Some decoder commands are implemented in the decoder plugins, thus they need to have an API call to signal that their current command has been finished. Let them use the new decoder_command_finished() instead of the internal dc_command_finished().
This commit is contained in:
@@ -391,7 +391,7 @@ static int aac_decode(struct decoder * mpd_decoder, char *path)
|
||||
bitRate, NULL);
|
||||
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) {
|
||||
dc.seekError = 1;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
} else if (decoder_get_command(decoder) == DECODE_COMMAND_STOP)
|
||||
break;
|
||||
}
|
||||
@@ -407,7 +407,7 @@ static int aac_decode(struct decoder * mpd_decoder, char *path)
|
||||
|
||||
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) {
|
||||
dc.seekError = 1;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -95,7 +95,7 @@ static int audiofile_decode(struct decoder * decoder, char *path)
|
||||
current = dc.seekWhere *
|
||||
audio_format.sampleRate;
|
||||
afSeekFrame(af_fp, AF_DEFAULT_TRACK, current);
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
|
||||
ret = afReadFrames(af_fp, AF_DEFAULT_TRACK, chunk,
|
||||
|
||||
@@ -433,7 +433,7 @@ static int flac_decode_internal(struct decoder * decoder,
|
||||
data.position = 0;
|
||||
} else
|
||||
dc.seekError = 1;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
}
|
||||
if (decoder_get_command(decoder) != DECODE_COMMAND_STOP) {
|
||||
|
||||
@@ -189,7 +189,7 @@ static int mod_decode(struct decoder * decoder, char *path)
|
||||
while (1) {
|
||||
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) {
|
||||
dc.seekError = 1;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
|
||||
if (decoder_get_command(decoder) == DECODE_COMMAND_STOP)
|
||||
|
||||
@@ -855,7 +855,7 @@ static int mp3Read(mp3DecodeData * data, struct decoder *decoder,
|
||||
data->outputPtr = data->outputBuffer;
|
||||
decoder_clear(decoder);
|
||||
data->muteFrame = 0;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@@ -968,12 +968,12 @@ static int mp3Read(mp3DecodeData * data, struct decoder *decoder,
|
||||
} else
|
||||
dc.seekError = 1;
|
||||
data->muteFrame = 0;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
} else if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK &&
|
||||
!data->inStream->seekable) {
|
||||
dc.seekError = 1;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1076,7 +1076,7 @@ static int mp3_decode(struct decoder * decoder, InputStream * inStream)
|
||||
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK &&
|
||||
data.muteFrame == MUTEFRAME_SEEK) {
|
||||
decoder_clear(decoder);
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
|
||||
decoder_flush(decoder);
|
||||
|
||||
@@ -213,7 +213,7 @@ static int mp4_decode(struct decoder * mpd_decoder, InputStream * inStream)
|
||||
seekPositionFound = 0;
|
||||
decoder_clear(mpd_decoder);
|
||||
seeking = 0;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(mpd_decoder);
|
||||
}
|
||||
|
||||
if (seeking)
|
||||
@@ -284,7 +284,7 @@ static int mp4_decode(struct decoder * mpd_decoder, InputStream * inStream)
|
||||
|
||||
if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK && seeking) {
|
||||
decoder_clear(mpd_decoder);
|
||||
dc_command_finished();
|
||||
decoder_command_finished(mpd_decoder);
|
||||
}
|
||||
decoder_flush(mpd_decoder);
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ static int mpc_decode(struct decoder * mpd_decoder, InputStream * inStream)
|
||||
chunkpos = 0;
|
||||
} else
|
||||
dc.seekError = 1;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(mpd_decoder);
|
||||
}
|
||||
|
||||
vbrUpdateAcc = 0;
|
||||
|
||||
@@ -364,7 +364,7 @@ static int oggflac_decode(struct decoder * mpd_decoder, InputStream * inStream)
|
||||
data.position = 0;
|
||||
} else
|
||||
dc.seekError = 1;
|
||||
dc_command_finished(dc);
|
||||
decoder_command_finished(mpd_decoder);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -273,7 +273,7 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream)
|
||||
chunkpos = 0;
|
||||
} else
|
||||
dc.seekError = 1;
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
ret = ov_read(&vf, chunk + chunkpos,
|
||||
OGG_CHUNK_SIZE - chunkpos,
|
||||
|
||||
@@ -188,7 +188,7 @@ static void wavpack_decode(struct decoder * decoder,
|
||||
dc.seekError = 1;
|
||||
}
|
||||
|
||||
dc_command_finished();
|
||||
decoder_command_finished(decoder);
|
||||
}
|
||||
|
||||
if (decoder_get_command(decoder) == DECODE_COMMAND_STOP)
|
||||
|
||||
Reference in New Issue
Block a user