diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-04-13 01:16:15 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-13 01:16:15 +0000 |
| commit | c1963ed483c66e85ac19ce8c3a6dbc6b19ca30c3 (patch) | |
| tree | b8c2ff14310e1e659f509aeae0cf847608af2d5f /src/inputPlugins/_flac_common.h | |
| parent | dec6b1612e953c6029d963ff55d2b4a669b60f43 (diff) | |
| download | mpd-c1963ed483c66e85ac19ce8c3a6dbc6b19ca30c3.tar.gz mpd-c1963ed483c66e85ac19ce8c3a6dbc6b19ca30c3.tar.xz mpd-c1963ed483c66e85ac19ce8c3a6dbc6b19ca30c3.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/inputPlugins/_flac_common.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h index 37b5fdaae..18e51d587 100644 --- a/src/inputPlugins/_flac_common.h +++ b/src/inputPlugins/_flac_common.h @@ -148,14 +148,13 @@ typedef struct { float time; unsigned int bitRate; FLAC__uint64 position; - OutputBuffer *cb; InputStream *inStream; ReplayGainInfo *replayGainInfo; MpdTag *tag; } FlacData; /* initializes a given FlacData struct */ -void init_FlacData(FlacData * data, OutputBuffer * cb, InputStream * inStream); +void init_FlacData(FlacData * data, InputStream * inStream); void flac_metadata_common_cb(const FLAC__StreamMetadata * block, FlacData * data); void flac_error_common_cb(const char *plugin, @@ -168,7 +167,7 @@ MpdTag *copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block, /* keep this inlined, this is just macro but prettier :) */ static inline int flacSendChunk(FlacData * data) { - if (sendDataToOutputBuffer(data->cb, data->inStream, + if (sendDataToOutputBuffer(data->inStream, 1, data->chunk, data->chunk_length, data->time, data->bitRate, |