aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-26 01:18:12 +0100
committerMax Kellermann <max@duempel.org>2013-01-26 01:23:02 +0100
commit3203a7dd8ce8db6afcc54d68d63b4f4af7dc4c7f (patch)
tree3e88008b1fbe0bebd676aac29b3415a7edc6fdab /src
parent86b0adc82ce64bb08518088c35ce754dc96d7062 (diff)
tag_file: convert to C++
Diffstat (limited to 'src')
-rw-r--r--src/TagFile.cxx (renamed from src/tag_file.c)8
-rw-r--r--src/TagFile.hxx (renamed from src/tag_file.h)6
-rw-r--r--src/playlist/EmbeddedCuePlaylistPlugin.cxx2
3 files changed, 10 insertions, 6 deletions
diff --git a/src/tag_file.c b/src/TagFile.cxx
index 8d8a0f5f..edb1f267 100644
--- a/src/tag_file.c
+++ b/src/TagFile.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2012 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,9 +18,13 @@
*/
#include "config.h"
-#include "tag_file.h"
+#include "TagFile.hxx"
+
+extern "C" {
#include "uri.h"
#include "decoder_list.h"
+}
+
#include "decoder_plugin.h"
#include "input_stream.h"
diff --git a/src/tag_file.h b/src/TagFile.hxx
index 8cf1af3c..61f49185 100644
--- a/src/tag_file.h
+++ b/src/TagFile.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2012 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_TAG_FILE_H
-#define MPD_TAG_FILE_H
+#ifndef MPD_TAG_FILE_HXX
+#define MPD_TAG_FILE_HXX
#include "check.h"
diff --git a/src/playlist/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/EmbeddedCuePlaylistPlugin.cxx
index 2337f806..5cd941df 100644
--- a/src/playlist/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/EmbeddedCuePlaylistPlugin.cxx
@@ -29,9 +29,9 @@
#include "tag.h"
#include "tag_handler.h"
#include "song.h"
+#include "TagFile.hxx"
extern "C" {
-#include "tag_file.h"
#include "tag_ape.h"
#include "tag_id3.h"
#include "cue/cue_parser.h"