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

undo last changes

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1217 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-05-28 02:27:36 +00:00
parent e93229bf49
commit 71e7127585
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
TODO
View File

@ -1,4 +1,12 @@
1) play streams 1) rewrite outputBuffering
a) rewrite outputBuffer to be nonBlocking-esqe to handle seek better
while paused
a) while() over sendToOutputBuffer until success or stop or
seek and return number of bytes written
b) means also removing conversion buffers from outputBuffer
and moving somewhere else
2) play streams
a) put some sort of error reporting for streaming/inputStream! a) put some sort of error reporting for streaming/inputStream!
b) fetch metadata and store in DecoderControl and pass to b) fetch metadata and store in DecoderControl and pass to
PlayerControl PlayerControl
@ -8,23 +16,23 @@
or something or something
d) in songinfo add a metadata tag item for indicating stream d) in songinfo add a metadata tag item for indicating stream
2) resampling audio for compatibility, and better gapless/crossfading 3) resampling audio for compatibility, and better gapless/crossfading
a) use resampling from oggenc (is it fast enough for realtime?) a) use resampling from oggenc (is it fast enough for realtime?)
3) when writing combined interface for all decodes to use, be sure to add a 4) when writing combined interface for all decodes to use, be sure to add a
common function and abstrct dealing with DecoderControl * and put common function and abstrct dealing with DecoderControl * and put
cycleLogFiles in there, so we cycleLogFiles while decoding, not just when cycleLogFiles in there, so we cycleLogFiles while decoding, not just when
decoding has stopped. decoding has stopped.
4) ACK error codes 5) ACK error codes
5) cleanup main() 6) cleanup main()
6) handle '\n' in filenames 7) handle '\n' in filenames
7) compute average replaygain to use for non-replaygain songs 8) compute average replaygain to use for non-replaygain songs
8) pid file 9) pid file
Post-1.0 Post-1.0

4
src/outputBuffer.c
View File

@ -74,8 +74,7 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
while(datalen) { while(datalen) {
if(currentChunk != cb->end) { if(currentChunk != cb->end) {
while(cb->begin==cb->end && cb->wrap && !dc->stop && while(cb->begin==cb->end && cb->wrap && !dc->stop)
!dc->seek)
{ {
if(!inStream || if(!inStream ||
bufferInputStream(inStream) <= 0) bufferInputStream(inStream) <= 0)
@ -84,7 +83,6 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
} }
} }
if(dc->stop) return OUTPUT_BUFFER_DC_STOP; if(dc->stop) return OUTPUT_BUFFER_DC_STOP;
if(dc->seek) return OUTPUT_BUFFER_DC_SEEK;
currentChunk = cb->end; currentChunk = cb->end;
cb->chunkSize[currentChunk] = 0; cb->chunkSize[currentChunk] = 0;