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/Makefile.am | |
| 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/Makefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d79bda29f..6c52dde1e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,8 +29,8 @@ mpd_inputPlugins = \ mpd_headers = \ - notify.h \ ack.h \ + action_status.h \ audio.h \ audioOutput.h \ buffer2array.h \ @@ -61,11 +61,15 @@ mpd_headers = \ compress.h \ os_compat.h \ outputBuffer.h \ + outputBuffer_config_init.h \ + outputBuffer_accessors.h \ + outputBuffer_audio.h \ + outputBuffer_ob_send.h \ + outputBuffer_xfade.h \ path.h \ pcm_utils.h \ permission.h \ - player.h \ - playerData.h \ + player_error.h \ playlist.h \ replayGain.h \ ringbuf.h \ @@ -92,7 +96,6 @@ mpd_SOURCES = \ $(mpd_headers) \ $(mpd_audioOutputs) \ $(mpd_inputPlugins) \ - notify.c \ audio.c \ audioOutput.c \ buffer2array.c \ @@ -122,8 +125,7 @@ mpd_SOURCES = \ path.c \ pcm_utils.c \ permission.c \ - player.c \ - playerData.c \ + player_error.c \ playlist.c \ replayGain.c \ ringbuf.c \ |