aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-04 10:31:59 +0100
committerMax Kellermann <max@duempel.org>2013-01-04 10:31:59 +0100
commit9a71845700e132b3e3fe5920aac24a5420c5d7b3 (patch)
treeafd196274fedad3bb456be2f0b6b8b25e676492b /src
parent22f0a1547c86895b4284b5fdc63ab9c82f24a442 (diff)
crossfade: convert to C++
Diffstat (limited to 'src')
-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.cxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/crossfade.c b/src/CrossFade.cxx
index cf394331..fe937e4c 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 d581dbfe..1c467075 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 cb641bbf..a394b844 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"
}