diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-08-20 01:31:51 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-08-20 01:31:51 -0700 |
| commit | 1b197e65232e1a51b853db53985e8eda61f1b196 (patch) | |
| tree | 2d85ff67ba79e32256a20d2d2bee7222352007fd /src/inputPlugins/_flac_common.h | |
| parent | 5a0216af3dc7c9dedc4dacb708191f0fd380bb73 (diff) | |
| parent | 508ae1c18d3bdc99a1bb06181762e5ec859cf072 (diff) | |
| download | mpd-1b197e65232e1a51b853db53985e8eda61f1b196.tar.gz mpd-1b197e65232e1a51b853db53985e8eda61f1b196.tar.xz mpd-1b197e65232e1a51b853db53985e8eda61f1b196.zip | |
Merge branch 'core-rewrite' of git://git.musicpd.org/normalperson/mpd
* 'core-rewrite' of git://git.musicpd.org/normalperson/mpd:
Remove ob_wait_sync and cleanup triggering in playlist
fix output buffer deadlock when daemonizing
log.c: thread-safety for warning log
core rewrite (decode,player,outputBuffer,playlist)
Diffstat (limited to 'src/inputPlugins/_flac_common.h')
| -rw-r--r-- | src/inputPlugins/_flac_common.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h index 10c2f3d38..5c147a064 100644 --- a/src/inputPlugins/_flac_common.h +++ b/src/inputPlugins/_flac_common.h @@ -165,17 +165,13 @@ MpdTag *copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block, MpdTag * tag); /* keep this inlined, this is just macro but prettier :) */ -static inline int flacSendChunk(FlacData * data) +static inline enum dc_action flacSendChunk(FlacData * data) { - if (ob_send(data->inStream, - 1, data->chunk, - data->chunk_length, data->time, - data->bitRate, - data->replayGainInfo) == - OUTPUT_BUFFER_DC_STOP) - return -1; - - return 0; + enum dc_action ret = ob_send(data->chunk, data->chunk_length, + data->time, data->bitRate, + data->replayGainInfo); + data->chunk_length = 0; + return ret; } #endif /* HAVE_FLAC || HAVE_OGGFLAC */ |