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

added output_buffer_skip()

Browse Source 
First patch without camelCase ;)

output_buffer_skip() lets us eliminate advanceOutputBufferTo(), and
removes yet another external OutputBuffer struct access.

git-svn-id: https://svn.musicpd.org/mpd/trunk@7312 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann 2008-04-12 04:18:19 +00:00 committed by Eric Wong
parent e20b71ed63
commit 20c4638a2e
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/decode.c
View File

@ -361,11 +361,6 @@ void decoderInit(void)
FATAL("Failed to spawn decoder task: %s\n", strerror(errno));
}
static void advanceOutputBufferTo(OutputBuffer * cb, int to)
{
cb->begin = to;
}
static void crossFade(OutputBufferChunk * a, OutputBufferChunk * b,
AudioFormat * format,
unsigned int fadePosition, unsigned int crossFadeChunks)
@ -576,9 +571,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
/* the cross-fade is finished; skip
the section which was cross-faded
(and thus already played) */
nextChunk = outputBufferAbsolute(cb, crossFadeChunks);
if (nextChunk >= 0)
advanceOutputBufferTo(cb, nextChunk);
output_buffer_skip(cb, crossFadeChunks);
}
doCrossFade = 0;

6
src/outputBuffer.c
View File

@ -218,3 +218,9 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
return 0;
}
void output_buffer_skip(OutputBuffer * cb, unsigned num)
{
int i = outputBufferAbsolute(cb, num);
if (i >= 0)
cb->begin = i;
}

2
src/outputBuffer.h
View File

@ -99,4 +99,6 @@ int sendDataToOutputBuffer(OutputBuffer * cb,
float data_time,
mpd_uint16 bitRate, ReplayGainInfo * replayGainInfo);
void output_buffer_skip(OutputBuffer * cb, unsigned num);
#endif