aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-05-28 02:27:36 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-05-28 02:27:36 +0000
commit71e7127585bef04c06f3555686ac934a33d97bd8 (patch)
treebf3ac9bd20a713e29922d4eb6cb0042767bda7eb
parente93229bf49d5f5647f67241626e1a8becae7b65d (diff)
downloadmpd-71e7127585bef04c06f3555686ac934a33d97bd8.tar.gz
mpd-71e7127585bef04c06f3555686ac934a33d97bd8.tar.xz
mpd-71e7127585bef04c06f3555686ac934a33d97bd8.zip
undo last changes
git-svn-id: https://svn.musicpd.org/mpd/trunk@1217 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--TODO24
-rw-r--r--src/outputBuffer.c4
2 files changed, 17 insertions, 11 deletions
diff --git a/TODO b/TODO
index 06931c088..1229bc4d6 100644
--- a/TODO
+++ b/TODO
@@ -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!
b) fetch metadata and store in DecoderControl and pass to
PlayerControl
@@ -8,23 +16,23 @@
or something
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?)
-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
cycleLogFiles in there, so we cycleLogFiles while decoding, not just when
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
diff --git a/src/outputBuffer.c b/src/outputBuffer.c
index b5ccaff52..f1ea86925 100644
--- a/src/outputBuffer.c
+++ b/src/outputBuffer.c
@@ -74,8 +74,7 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
while(datalen) {
if(currentChunk != cb->end) {
- while(cb->begin==cb->end && cb->wrap && !dc->stop &&
- !dc->seek)
+ while(cb->begin==cb->end && cb->wrap && !dc->stop)
{
if(!inStream ||
bufferInputStream(inStream) <= 0)
@@ -84,7 +83,6 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
}
}
if(dc->stop) return OUTPUT_BUFFER_DC_STOP;
- if(dc->seek) return OUTPUT_BUFFER_DC_SEEK;
currentChunk = cb->end;
cb->chunkSize[currentChunk] = 0;