Stop passing our single OutputBuffer object everywhere

All of our main singleton data structures are implicitly shared,
so there's no reason to keep passing them around and around in
the stack and making our internal API harder to deal with.

git-svn-id: https://svn.musicpd.org/mpd/trunk@7354 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong
2008-04-13 01:16:15 +00:00
parent dec6b1612e
commit c1963ed483
18 changed files with 199 additions and 215 deletions

View File

@@ -36,13 +36,12 @@
#include <FLAC/format.h>
#include <FLAC/metadata.h>
void init_FlacData(FlacData * data, OutputBuffer * cb, InputStream * inStream)
void init_FlacData(FlacData * data, InputStream * inStream)
{
data->chunk_length = 0;
data->time = 0;
data->position = 0;
data->bitRate = 0;
data->cb = cb;
data->inStream = inStream;
data->replayGainInfo = NULL;
data->tag = NULL;
@@ -171,8 +170,7 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
dc.audioFormat.sampleRate = si->sample_rate;
dc.audioFormat.channels = (mpd_sint8)si->channels;
dc.totalTime = ((float)si->total_samples) / (si->sample_rate);
getOutputAudioFormat(&(dc.audioFormat),
&(data->cb->audioFormat));
getOutputAudioFormat(&(dc.audioFormat), &(cb.audioFormat));
break;
case FLAC__METADATA_TYPE_VORBIS_COMMENT:
flacParseReplayGain(block, data);