From 4f229c254c5a99a95e080ec3e3c429990f29a41d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 24 Nov 2016 16:40:47 +0100 Subject: [PATCH] ReplayGainInfo: move enum ReplayGainMode to separate header --- Makefile.am | 1 + src/ReplayGainConfig.hxx | 2 +- src/ReplayGainInfo.hxx | 8 +------- src/ReplayGainMode.hxx | 30 ++++++++++++++++++++++++++++++ src/output/Internal.hxx | 2 +- src/output/MultipleOutputs.hxx | 2 +- 6 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 src/ReplayGainMode.hxx diff --git a/Makefile.am b/Makefile.am index b73efecb0..08540966f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -853,6 +853,7 @@ libbasic_a_SOURCES = \ src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \ src/AudioFormat.cxx src/AudioFormat.hxx \ src/AudioParser.cxx src/AudioParser.hxx \ + src/ReplayGainMode.hxx \ src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx # configuration library diff --git a/src/ReplayGainConfig.hxx b/src/ReplayGainConfig.hxx index c51e82d16..5c1953c3b 100644 --- a/src/ReplayGainConfig.hxx +++ b/src/ReplayGainConfig.hxx @@ -21,7 +21,7 @@ #define MPD_REPLAY_GAIN_CONFIG_HXX #include "check.h" -#include "ReplayGainInfo.hxx" +#include "ReplayGainMode.hxx" #include "Compiler.h" extern ReplayGainMode replay_gain_mode; diff --git a/src/ReplayGainInfo.hxx b/src/ReplayGainInfo.hxx index 18e21604d..9bcd3f0f0 100644 --- a/src/ReplayGainInfo.hxx +++ b/src/ReplayGainInfo.hxx @@ -22,13 +22,7 @@ #include "check.h" #include "Compiler.h" - -enum ReplayGainMode { - REPLAY_GAIN_AUTO = -2, - REPLAY_GAIN_OFF, - REPLAY_GAIN_ALBUM, - REPLAY_GAIN_TRACK, -}; +#include "ReplayGainMode.hxx" struct ReplayGainTuple { float gain; diff --git a/src/ReplayGainMode.hxx b/src/ReplayGainMode.hxx new file mode 100644 index 000000000..8893aba14 --- /dev/null +++ b/src/ReplayGainMode.hxx @@ -0,0 +1,30 @@ +/* + * Copyright 2003-2016 The Music Player Daemon Project + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_REPLAY_GAIN_MODE_HXX +#define MPD_REPLAY_GAIN_MODE_HXX + +enum ReplayGainMode { + REPLAY_GAIN_AUTO = -2, + REPLAY_GAIN_OFF, + REPLAY_GAIN_ALBUM, + REPLAY_GAIN_TRACK, +}; + +#endif diff --git a/src/output/Internal.hxx b/src/output/Internal.hxx index 750e58e97..2c5f4ba56 100644 --- a/src/output/Internal.hxx +++ b/src/output/Internal.hxx @@ -23,7 +23,7 @@ #include "AudioFormat.hxx" #include "pcm/PcmBuffer.hxx" #include "pcm/PcmDither.hxx" -#include "ReplayGainInfo.hxx" +#include "ReplayGainMode.hxx" #include "filter/Observer.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" diff --git a/src/output/MultipleOutputs.hxx b/src/output/MultipleOutputs.hxx index c2f8c7383..be2a33e09 100644 --- a/src/output/MultipleOutputs.hxx +++ b/src/output/MultipleOutputs.hxx @@ -27,7 +27,7 @@ #define OUTPUT_ALL_H #include "AudioFormat.hxx" -#include "ReplayGainInfo.hxx" +#include "ReplayGainMode.hxx" #include "Chrono.hxx" #include "Compiler.h"