diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -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.cxx | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 577055d51..f8f5ae951 100644 --- a/Makefile.am +++ b/Makefile.am @@ -269,7 +269,7 @@ src_mpd_SOURCES = \ src/TagPrint.cxx src/TagPrint.hxx \ src/TagSave.cxx src/TagSave.hxx \ src/tag_handler.c src/tag_handler.h \ - src/tag_file.c src/tag_file.h \ + src/TagFile.cxx src/TagFile.hxx \ src/tokenizer.c \ src/TextFile.cxx src/TextFile.hxx \ src/text_input_stream.c \ @@ -1115,7 +1115,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \ src/ConfigFile.cxx src/tokenizer.c src/utils.c src/string_util.c\ src/uri.c \ src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \ - src/tag_handler.c src/tag_file.c \ + src/tag_handler.c src/TagFile.cxx \ src/audio_check.c src/pcm_buffer.c \ src/text_input_stream.c \ src/cue/cue_parser.c src/cue/cue_parser.h \ diff --git a/src/tag_file.c b/src/TagFile.cxx index 8d8a0f5fb..edb1f267e 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 8cf1af3cb..61f491854 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 2337f806e..5cd941df6 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" |