Commit 9a718457 authored by Max Kellermann's avatar Max Kellermann

crossfade: convert to C++

parent 22f0a154
...@@ -65,7 +65,6 @@ mpd_headers = \ ...@@ -65,7 +65,6 @@ mpd_headers = \
src/command.h \ src/command.h \
src/idle.h \ src/idle.h \
src/conf.h \ src/conf.h \
src/crossfade.h \
src/decoder_plugin.h \ src/decoder_plugin.h \
src/decoder_command.h \ src/decoder_command.h \
src/decoder_buffer.h \ src/decoder_buffer.h \
...@@ -194,7 +193,7 @@ src_mpd_SOURCES = \ ...@@ -194,7 +193,7 @@ src_mpd_SOURCES = \
src/idle.c \ src/idle.c \
src/CommandLine.cxx src/CommandLine.hxx \ src/CommandLine.cxx src/CommandLine.hxx \
src/conf.c \ src/conf.c \
src/crossfade.c \ src/CrossFade.cxx src/CrossFade.hxx \
src/cue/cue_parser.c src/cue/cue_parser.h \ src/cue/cue_parser.c src/cue/cue_parser.h \
src/decoder_error.h \ src/decoder_error.h \
src/DecoderThread.cxx src/DecoderThread.hxx \ src/DecoderThread.cxx src/DecoderThread.hxx \
......
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "crossfade.h" #include "CrossFade.hxx"
#include "MusicChunk.hxx" #include "MusicChunk.hxx"
#include "audio_format.h" #include "audio_format.h"
#include "tag.h" #include "tag.h"
......
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_CROSSFADE_H #ifndef MPD_CROSSFADE_HXX
#define MPD_CROSSFADE_H #define MPD_CROSSFADE_HXX
struct audio_format; struct audio_format;
struct music_chunk; struct music_chunk;
......
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
#include "song.h" #include "song.h"
#include "Main.hxx" #include "Main.hxx"
#include "mpd_error.h" #include "mpd_error.h"
#include "CrossFade.hxx"
extern "C" { extern "C" {
#include "player_control.h" #include "player_control.h"
#include "output_all.h" #include "output_all.h"
#include "event_pipe.h" #include "event_pipe.h"
#include "crossfade.h"
#include "tag.h" #include "tag.h"
#include "idle.h" #include "idle.h"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment