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

playing, stopping, and seeking mpc files should work now. next is parsing metadata for the db.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2924 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2005-02-02 02:21:58 +00:00
parent 3d671eca3a
commit c87b9cf439
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/inputPlugins/mpc_plugin.c
View File

@ -60,7 +60,7 @@ mpc_int32_t mpc_read_cb(void * vdata, void * ptr, mpc_int32_t size) {
static mpc_bool_t mpc_seek_cb(void * vdata, mpc_int32_t offset) { static mpc_bool_t mpc_seek_cb(void * vdata, mpc_int32_t offset) {
MpcCallbackData * data = (MpcCallbackData *)vdata; MpcCallbackData * data = (MpcCallbackData *)vdata;
return !seekInputStream(data->inStream , offset, SEEK_SET); return seekInputStream(data->inStream , offset, SEEK_SET) < 0 ? 0 : 1;
} }
mpc_int32_t mpc_tell_cb(void * vdata) { mpc_int32_t mpc_tell_cb(void * vdata) {
@ -149,7 +149,6 @@ int mpc_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream)
closeInputStream(inStream); closeInputStream(inStream);
if(!dc->stop) { if(!dc->stop) {
ERROR("Not a valid musepack stream"); ERROR("Not a valid musepack stream");
DEBUG("ret: %i\n", ret);
return -1; return -1;
} }
else { else {
@ -185,7 +184,7 @@ int mpc_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream)
while(!eof) { while(!eof) {
if(dc->seek) { if(dc->seek) {
samplePos = dc->seekWhere * dc->audioFormat.sampleRate; samplePos = dc->seekWhere * dc->audioFormat.sampleRate;
if(0 == mpc_decoder_seek_sample(&decoder, samplePos)) { if(mpc_decoder_seek_sample(&decoder, samplePos)) {
clearOutputBuffer(cb); clearOutputBuffer(cb);
chunkpos = 0; chunkpos = 0;
} }
@ -193,10 +192,12 @@ int mpc_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream)
dc->seek = 0; dc->seek = 0;
} }
DEBUG("HERE 1\n");
ret = mpc_decoder_decode(&decoder, sample_buffer, ret = mpc_decoder_decode(&decoder, sample_buffer,
&vbrUpdateAcc, &vbrUpdateBits); &vbrUpdateAcc, &vbrUpdateBits);
DEBUG("HERE 2\n");
if(ret <= 0 ) { if(ret <= 0 || dc->stop ) {
eof = 1; eof = 1;
break; break;
} }
@ -228,7 +229,10 @@ int mpc_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream)
NULL); NULL);
chunkpos = 0; chunkpos = 0;
s16 = (mpd_sint16 *)chunk; s16 = (mpd_sint16 *)chunk;
if(dc->stop) break; if(dc->stop) {
eof = 1;
break;
}
} }
} }
} }
@ -246,12 +250,13 @@ int mpc_decode(OutputBuffer * cb, DecoderControl * dc, InputStream * inStream)
closeInputStream(inStream); closeInputStream(inStream);
flushOutputBuffer(cb);
if(dc->stop) { if(dc->stop) {
dc->state = DECODE_STATE_STOP; dc->state = DECODE_STATE_STOP;
dc->stop = 0; dc->stop = 0;
} }
else { else {
flushOutputBuffer(cb);
dc->state = DECODE_STATE_STOP; dc->state = DECODE_STATE_STOP;
} }