diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-09-29 02:09:30 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-09-29 02:09:30 -0700 |
| commit | 1e36728aedede8f521b622ef32ca102e79cb61f6 (patch) | |
| tree | ad016b7ca280a03b7fc3095738a927bb4e374572 /src/inputPlugins/_flac_common.h | |
| parent | 8e3bfa4e5d5a3efa9661f938fa79dd031c3b66e3 (diff) | |
| parent | 198f0117c4d1f87cfed51fd51c5bf7bb50cd5334 (diff) | |
| download | mpd-1e36728aedede8f521b622ef32ca102e79cb61f6.tar.gz mpd-1e36728aedede8f521b622ef32ca102e79cb61f6.tar.xz mpd-1e36728aedede8f521b622ef32ca102e79cb61f6.zip | |
Merge branch 'mk/flac'
* mk/flac:
flac: removed FlacData.chunk_length
flac: merged flacSendChunk() into flac_common_write()
flac: removed generic sample size support
flac: added special functions for 8 and 32 bit
flac: added optimized converter for 16 bit
flac: use signed integers in flac_convert_stereo16()
flac: moved code from flacWrite() to _flac_common.c
flac: assume the buffer is empty in flacWrite() II
Diffstat (limited to 'src/inputPlugins/_flac_common.h')
| -rw-r--r-- | src/inputPlugins/_flac_common.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h index a1b0cac8f..f88866b08 100644 --- a/src/inputPlugins/_flac_common.h +++ b/src/inputPlugins/_flac_common.h @@ -140,7 +140,6 @@ typedef size_t flac_read_status_size_t; typedef struct { unsigned char chunk[FLAC_CHUNK_SIZE]; - size_t chunk_length; float time; unsigned int bitRate; FLAC__uint64 position; @@ -160,15 +159,9 @@ void flac_error_common_cb(const char *plugin, struct mpd_tag *copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block, struct mpd_tag *tag); -/* keep this inlined, this is just macro but prettier :) */ -static inline enum dc_action flacSendChunk(FlacData * data) -{ - enum dc_action ret = ob_send(data->chunk, data->chunk_length, - data->time, data->bitRate, - data->replayGainInfo); - data->chunk_length = 0; - return ret; -} +FLAC__StreamDecoderWriteStatus +flac_common_write(FlacData *data, const FLAC__Frame * frame, + const FLAC__int32 *const buf[]); #endif /* HAVE_FLAC || HAVE_OGGFLAC */ |