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/outputBuffer_sequence.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 '')
| -rw-r--r-- | src/outputBuffer_sequence.h (renamed from src/playerData.h) | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/playerData.h b/src/outputBuffer_sequence.h index cf7f72cf0..25181425f 100644 --- a/src/playerData.h +++ b/src/outputBuffer_sequence.h @@ -16,20 +16,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef PLAYER_DATA_H -#define PLAYER_DATA_H +#ifndef OUTPUT_BUFFER_SEQUENCE_H +#define OUTPUT_BUFFER_SEQUENCE_H -#include "audio.h" -#include "player.h" -#include "decode.h" -#include "mpd_types.h" -#include "outputBuffer.h" - -extern unsigned int buffered_before_play; -extern PlayerControl pc; -extern DecoderControl dc; -extern OutputBuffer ob; - -void initPlayerData(void); +/* + * prevent the decoder thread from being more than one song + * ahead of the output buffer + */ +void ob_seq_enter(void); +void ob_seq_leave(void); +void ob_seq_wait(void); -#endif +#endif /* OUTPUT_BUFFER_SEQUENCE_H */ |