diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/CrossFade.cxx (renamed from src/crossfade.c) | 4 | ||||
| -rw-r--r-- | src/CrossFade.hxx (renamed from src/crossfade.h) | 6 | ||||
| -rw-r--r-- | src/PlayerThread.cxx | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index ea9a53bec..df402b038 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,6 @@ mpd_headers = \ src/command.h \ src/idle.h \ src/conf.h \ - src/crossfade.h \ src/decoder_plugin.h \ src/decoder_command.h \ src/decoder_buffer.h \ @@ -194,7 +193,7 @@ src_mpd_SOURCES = \ src/idle.c \ src/CommandLine.cxx src/CommandLine.hxx \ src/conf.c \ - src/crossfade.c \ + src/CrossFade.cxx src/CrossFade.hxx \ src/cue/cue_parser.c src/cue/cue_parser.h \ src/decoder_error.h \ src/DecoderThread.cxx src/DecoderThread.hxx \ diff --git a/src/crossfade.c b/src/CrossFade.cxx index cf3943314..fe937e4ca 100644 --- a/src/crossfade.c +++ b/src/CrossFade.cxx @@ -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 @@ -18,7 +18,7 @@ */ #include "config.h" -#include "crossfade.h" +#include "CrossFade.hxx" #include "MusicChunk.hxx" #include "audio_format.h" #include "tag.h" diff --git a/src/crossfade.h b/src/CrossFade.hxx index d581dbfe0..1c4670758 100644 --- a/src/crossfade.h +++ b/src/CrossFade.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_CROSSFADE_H -#define MPD_CROSSFADE_H +#ifndef MPD_CROSSFADE_HXX +#define MPD_CROSSFADE_HXX struct audio_format; struct music_chunk; diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx index cb641bbfb..a394b8445 100644 --- a/src/PlayerThread.cxx +++ b/src/PlayerThread.cxx @@ -27,12 +27,12 @@ #include "song.h" #include "Main.hxx" #include "mpd_error.h" +#include "CrossFade.hxx" extern "C" { #include "player_control.h" #include "output_all.h" #include "event_pipe.h" -#include "crossfade.h" #include "tag.h" #include "idle.h" } |