diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-01-03 07:29:49 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-01-03 07:29:49 +0000 |
| commit | cb8f1af3bd5056109bfbe75faf568430a5121bda (patch) | |
| tree | 86d812b051bca48fd6b4f32706d506a3d77a3989 /src/audioOutputs/audioOutput_jack.c | |
| parent | 790e70cf25ade17e7412b153c440ef4999fe72fd (diff) | |
| download | mpd-cb8f1af3bd5056109bfbe75faf568430a5121bda.tar.gz mpd-cb8f1af3bd5056109bfbe75faf568430a5121bda.tar.xz mpd-cb8f1af3bd5056109bfbe75faf568430a5121bda.zip | |
Cleanup #includes of standard system headers and put them in one place
This will make refactoring features easier, especially now that
pthreads support and larger refactorings are on the horizon.
Hopefully, this will make porting to other platforms (even
non-UNIX-like ones for masochists) easier, too.
os_compat.h will house all the #includes for system headers
considered to be the "core" of MPD. Headers for optional
features will be left to individual source files.
git-svn-id: https://svn.musicpd.org/mpd/trunk@7130 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/audioOutputs/audioOutput_jack.c')
| -rw-r--r-- | src/audioOutputs/audioOutput_jack.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c index d38f00bad..253da2159 100644 --- a/src/audioOutputs/audioOutput_jack.c +++ b/src/audioOutputs/audioOutput_jack.c @@ -19,15 +19,10 @@ #ifdef HAVE_JACK -#include <stdlib.h> -#include <errno.h> - +#include "../os_compat.h" #include "../conf.h" #include "../log.h" -#include <string.h> -#include <pthread.h> - #include <jack/jack.h> #include <jack/types.h> #include <jack/ringbuffer.h> @@ -37,7 +32,11 @@ pthread_cond_t play_audio = PTHREAD_COND_INITIALIZER; /*#include "dmalloc.h"*/ -#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#ifdef MIN +# undef MIN +# define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif + /*#define SAMPLE_SIZE sizeof(jack_default_audio_sample_t);*/ |