diff options
| -rw-r--r-- | src/audio.h | 13 | ||||
| -rw-r--r-- | src/audioOutput.c | 1 | ||||
| -rw-r--r-- | src/audioOutput.h | 2 | ||||
| -rw-r--r-- | src/audio_format.h | 35 | ||||
| -rw-r--r-- | src/command.c | 1 | ||||
| -rw-r--r-- | src/decode.h | 2 | ||||
| -rw-r--r-- | src/normalize.h | 2 | ||||
| -rw-r--r-- | src/pcm_utils.h | 2 | ||||
| -rw-r--r-- | src/replayGain.h | 2 | ||||
| -rw-r--r-- | src/timer.h | 4 |
10 files changed, 45 insertions, 19 deletions
diff --git a/src/audio.h b/src/audio.h index eab83916a..c9dea54d2 100644 --- a/src/audio.h +++ b/src/audio.h @@ -19,23 +19,12 @@ #ifndef AUDIO_H #define AUDIO_H -#include "mpd_types.h" #include "tag.h" #include "os_compat.h" +#include "audio_format.h" #define AUDIO_AO_DRIVER_DEFAULT "default" -typedef struct _AudioFormat { - volatile mpd_sint8 channels; - volatile mpd_uint32 sampleRate; - volatile mpd_sint8 bits; -} AudioFormat; - -static inline double audioFormatSizeToTime(const AudioFormat * af) -{ - return 8.0 / af->bits / af->channels / af->sampleRate; -} - void copyAudioFormat(AudioFormat * dest, const AudioFormat * src); int cmpAudioFormat(const AudioFormat * dest, const AudioFormat * src); diff --git a/src/audioOutput.c b/src/audioOutput.c index ff5efabc9..24779a04d 100644 --- a/src/audioOutput.c +++ b/src/audioOutput.c @@ -22,6 +22,7 @@ #include "log.h" #include "pcm_utils.h" #include "os_compat.h" +#include "audio.h" #define AUDIO_OUTPUT_TYPE "type" #define AUDIO_OUTPUT_NAME "name" diff --git a/src/audioOutput.h b/src/audioOutput.h index 7574f5ae1..71c1e4b14 100644 --- a/src/audioOutput.h +++ b/src/audioOutput.h @@ -23,7 +23,7 @@ #include "pcm_utils.h" #include "mpd_types.h" -#include "audio.h" +#include "audio_format.h" #include "tag.h" #include "conf.h" #include "utils.h" diff --git a/src/audio_format.h b/src/audio_format.h new file mode 100644 index 000000000..ba22b3bf6 --- /dev/null +++ b/src/audio_format.h @@ -0,0 +1,35 @@ +/* the Music Player Daemon (MPD) + * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) + * This project's homepage is: http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef AUDIO_FORMAT_H +#define AUDIO_FORMAT_H + +#include "mpd_types.h" + +typedef struct _AudioFormat { + volatile mpd_sint8 channels; + volatile mpd_uint32 sampleRate; + volatile mpd_sint8 bits; +} AudioFormat; + +static inline double audioFormatSizeToTime(const AudioFormat * af) +{ + return 8.0 / af->bits / af->channels / af->sampleRate; +} + +#endif diff --git a/src/command.c b/src/command.c index abe0ab8b0..27e7f3408 100644 --- a/src/command.c +++ b/src/command.c @@ -31,6 +31,7 @@ #include "storedPlaylist.h" #include "sllist.h" #include "ack.h" +#include "audio.h" #include "os_compat.h" #include "player_error.h" #include "outputBuffer.h" diff --git a/src/decode.h b/src/decode.h index b1ba138e2..61eeee078 100644 --- a/src/decode.h +++ b/src/decode.h @@ -21,8 +21,8 @@ #include "song.h" -#include "audio.h" #include "condition.h" +#include "audio_format.h" #define DECODE_TYPE_FILE 0 #define DECODE_TYPE_URL 1 diff --git a/src/normalize.h b/src/normalize.h index 8356b2a7c..81c9c81c4 100644 --- a/src/normalize.h +++ b/src/normalize.h @@ -19,7 +19,7 @@ #ifndef NORMALIZE_H #define NORMALIZE_H -#include "audio.h" +#include "audio_format.h" extern int normalizationEnabled; diff --git a/src/pcm_utils.h b/src/pcm_utils.h index 53d268db7..2ecb56201 100644 --- a/src/pcm_utils.h +++ b/src/pcm_utils.h @@ -21,7 +21,7 @@ #include "../config.h" -#include "audio.h" +#include "audio_format.h" #include "os_compat.h" #ifdef HAVE_LIBSAMPLERATE diff --git a/src/replayGain.h b/src/replayGain.h index 8df6fb0b1..8282da785 100644 --- a/src/replayGain.h +++ b/src/replayGain.h @@ -20,7 +20,7 @@ #ifndef REPLAYGAIN_H #define REPLAYGAIN_H -#include "audio.h" +#include "audio_format.h" #define REPLAYGAIN_OFF 0 #define REPLAYGAIN_TRACK 1 diff --git a/src/timer.h b/src/timer.h index c8018e260..6851a1535 100644 --- a/src/timer.h +++ b/src/timer.h @@ -19,8 +19,8 @@ #ifndef MPD_TIMER_H #define MPD_TIMER_H -#include "audio.h" -#include "mpd_types.h" +#include "audio_format.h" +#include "os_compat.h" typedef struct _Timer { uint64_t time; |