diff options
25 files changed, 27 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am index da481bd04..854a147e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,6 @@ mpd_headers = \ src/check.h \ src/ack.h \ src/audio_format.h \ - src/output_api.h \ src/filter_internal.h \ src/command.h \ src/conf.h \ @@ -770,6 +769,7 @@ OUTPUT_LIBS = \ $(SHOUT_LIBS) OUTPUT_API_SRC = \ + src/OutputAPI.hxx \ src/OutputInternal.hxx \ src/OutputList.cxx src/OutputList.hxx \ src/OutputAll.cxx src/OutputAll.hxx \ diff --git a/src/output_api.h b/src/OutputAPI.hxx index dee72d8db..3aa4f7567 100644 --- a/src/output_api.h +++ b/src/OutputAPI.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_OUTPUT_API_H -#define MPD_OUTPUT_API_H +#ifndef MPD_OUTPUT_API_HXX +#define MPD_OUTPUT_API_HxX #include "OutputPlugin.hxx" #include "OutputInternal.hxx" diff --git a/src/OutputInit.cxx b/src/OutputInit.cxx index 8fb8e5b54..6f637f538 100644 --- a/src/OutputInit.cxx +++ b/src/OutputInit.cxx @@ -22,8 +22,8 @@ #include "OutputControl.hxx" #include "OutputList.hxx" #include "OutputError.hxx" +#include "OutputAPI.hxx" #include "FilterConfig.hxx" -#include "output_api.h" #include "AudioParser.hxx" #include "MixerList.hxx" #include "MixerType.hxx" diff --git a/src/OutputList.cxx b/src/OutputList.cxx index abbc02bcf..aebfcc963 100644 --- a/src/OutputList.cxx +++ b/src/OutputList.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "OutputList.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "output/AlsaOutputPlugin.hxx" #include "output/AoOutputPlugin.hxx" #include "output/FifoOutputPlugin.hxx" diff --git a/src/OutputThread.cxx b/src/OutputThread.cxx index 1f6a21654..9bee3a821 100644 --- a/src/OutputThread.cxx +++ b/src/OutputThread.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "OutputThread.hxx" #include "OutputInternal.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "pcm/PcmMix.hxx" #include "notify.hxx" #include "FilterInternal.hxx" diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/AlsaMixerPlugin.cxx index 68ad859ff..a78b83f8a 100644 --- a/src/mixer/AlsaMixerPlugin.cxx +++ b/src/mixer/AlsaMixerPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "MixerInternal.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "GlobalEvents.hxx" #include "Main.hxx" #include "event/MultiSocketMonitor.hxx" diff --git a/src/mixer/OssMixerPlugin.cxx b/src/mixer/OssMixerPlugin.cxx index 24471c035..4de1e2e45 100644 --- a/src/mixer/OssMixerPlugin.cxx +++ b/src/mixer/OssMixerPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "MixerInternal.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "fd_util.h" #include <glib.h> diff --git a/src/mixer/RoarMixerPlugin.cxx b/src/mixer/RoarMixerPlugin.cxx index 0533711c1..92a22f51b 100644 --- a/src/mixer/RoarMixerPlugin.cxx +++ b/src/mixer/RoarMixerPlugin.cxx @@ -21,7 +21,7 @@ #include "config.h" #include "MixerInternal.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "output/RoarOutputPlugin.hxx" struct RoarMixer final : public Mixer { diff --git a/src/mixer/WinmmMixerPlugin.cxx b/src/mixer/WinmmMixerPlugin.cxx index 73013fd93..89ed854ae 100644 --- a/src/mixer/WinmmMixerPlugin.cxx +++ b/src/mixer/WinmmMixerPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "MixerInternal.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "output/WinmmOutputPlugin.hxx" #include <mmsystem.h> diff --git a/src/output/AlsaOutputPlugin.cxx b/src/output/AlsaOutputPlugin.cxx index bbb22ab39..17fc91d1a 100644 --- a/src/output/AlsaOutputPlugin.cxx +++ b/src/output/AlsaOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "AlsaOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "MixerList.hxx" #include "pcm/PcmExport.hxx" #include "util/Manual.hxx" diff --git a/src/output/AoOutputPlugin.cxx b/src/output/AoOutputPlugin.cxx index c6ee6a2ea..85f0ca5cb 100644 --- a/src/output/AoOutputPlugin.cxx +++ b/src/output/AoOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "AoOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include <ao/ao.h> #include <glib.h> diff --git a/src/output/FifoOutputPlugin.cxx b/src/output/FifoOutputPlugin.cxx index 15b107c45..1151d9f3a 100644 --- a/src/output/FifoOutputPlugin.cxx +++ b/src/output/FifoOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "FifoOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "Timer.hxx" #include "fd_util.h" #include "open.h" diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index 2c4884827..8c0b5f8be 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -21,7 +21,7 @@ #include "HttpdOutputPlugin.hxx" #include "HttpdInternal.hxx" #include "HttpdClient.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "encoder_plugin.h" #include "EncoderList.hxx" #include "resolver.h" diff --git a/src/output/JackOutputPlugin.cxx b/src/output/JackOutputPlugin.cxx index ea351d5c9..c32fb914b 100644 --- a/src/output/JackOutputPlugin.cxx +++ b/src/output/JackOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "JackOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include <assert.h> diff --git a/src/output/NullOutputPlugin.cxx b/src/output/NullOutputPlugin.cxx index b167032b6..07452bbdb 100644 --- a/src/output/NullOutputPlugin.cxx +++ b/src/output/NullOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "NullOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "Timer.hxx" #include <assert.h> diff --git a/src/output/OSXOutputPlugin.cxx b/src/output/OSXOutputPlugin.cxx index 5a04fe1db..cbd27413f 100644 --- a/src/output/OSXOutputPlugin.cxx +++ b/src/output/OSXOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "OSXOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "util/fifo_buffer.h" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" diff --git a/src/output/OpenALOutputPlugin.cxx b/src/output/OpenALOutputPlugin.cxx index 297291d4e..e68032d75 100644 --- a/src/output/OpenALOutputPlugin.cxx +++ b/src/output/OpenALOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "OpenALOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include <glib.h> diff --git a/src/output/OssOutputPlugin.cxx b/src/output/OssOutputPlugin.cxx index 495e07301..70ffd8bfc 100644 --- a/src/output/OssOutputPlugin.cxx +++ b/src/output/OssOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "OssOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "MixerList.hxx" #include "fd_util.h" diff --git a/src/output/PipeOutputPlugin.cxx b/src/output/PipeOutputPlugin.cxx index 7a60eae4e..6e72eff12 100644 --- a/src/output/PipeOutputPlugin.cxx +++ b/src/output/PipeOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "PipeOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include <stdio.h> #include <errno.h> diff --git a/src/output/PulseOutputPlugin.cxx b/src/output/PulseOutputPlugin.cxx index 261c92a04..5098e2adc 100644 --- a/src/output/PulseOutputPlugin.cxx +++ b/src/output/PulseOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "PulseOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "MixerList.hxx" #include "mixer/PulseMixerPlugin.hxx" diff --git a/src/output/RecorderOutputPlugin.cxx b/src/output/RecorderOutputPlugin.cxx index 7d15ed4b6..b9874debb 100644 --- a/src/output/RecorderOutputPlugin.cxx +++ b/src/output/RecorderOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "RecorderOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "encoder_plugin.h" #include "EncoderList.hxx" #include "fd_util.h" diff --git a/src/output/RoarOutputPlugin.cxx b/src/output/RoarOutputPlugin.cxx index 9de89b22f..328ef3922 100644 --- a/src/output/RoarOutputPlugin.cxx +++ b/src/output/RoarOutputPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "RoarOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "MixerList.hxx" #include "thread/Mutex.hxx" diff --git a/src/output/ShoutOutputPlugin.cxx b/src/output/ShoutOutputPlugin.cxx index 7662e33ab..912b57dc8 100644 --- a/src/output/ShoutOutputPlugin.cxx +++ b/src/output/ShoutOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "ShoutOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "encoder_plugin.h" #include "EncoderList.hxx" #include "mpd_error.h" diff --git a/src/output/SolarisOutputPlugin.cxx b/src/output/SolarisOutputPlugin.cxx index ac8910449..c20de4a8b 100644 --- a/src/output/SolarisOutputPlugin.cxx +++ b/src/output/SolarisOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "SolarisOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "fd_util.h" #include <glib.h> diff --git a/src/output/WinmmOutputPlugin.cxx b/src/output/WinmmOutputPlugin.cxx index 2386bfc61..34593b62f 100644 --- a/src/output/WinmmOutputPlugin.cxx +++ b/src/output/WinmmOutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "WinmmOutputPlugin.hxx" -#include "output_api.h" +#include "OutputAPI.hxx" #include "pcm/pcm_buffer.h" #include "MixerList.hxx" |