oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

text_file: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-03 10:12:41 +01:00
parent 93f0bb8307
commit 2452447c81
11 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -101,7 +101,6 @@ mpd_headers = \
src/input/despotify_input_plugin.h \ src/input/despotify_input_plugin.h \
src/input/cdio_paranoia_input_plugin.h \ src/input/cdio_paranoia_input_plugin.h \
src/despotify_utils.h \ src/despotify_utils.h \
src/text_file.h \
src/text_input_stream.h \ src/text_input_stream.h \
src/icy_server.h \ src/icy_server.h \
src/icy_metadata.h \ src/icy_metadata.h \
@ -318,7 +317,7 @@ src_mpd_SOURCES = \
src/tag_handler.c src/tag_handler.h \ src/tag_handler.c src/tag_handler.h \
src/tag_file.c src/tag_file.h \ src/tag_file.c src/tag_file.h \
src/tokenizer.c \ src/tokenizer.c \
src/text_file.c \ src/TextFile.cxx src/TextFile.hxx \
src/text_input_stream.c \ src/text_input_stream.c \
src/uri.c \ src/uri.c \
src/utils.c \ src/utils.c \
@ -1069,7 +1068,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
src/tag.c src/tag_pool.c src/TagSave.cxx \ src/tag.c src/tag_pool.c src/TagSave.cxx \
src/path.c \ src/path.c \
src/SongFilter.cxx \ src/SongFilter.cxx \
src/text_file.c \ src/TextFile.cxx \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/conf.c src/tokenizer.c src/utils.c src/string_util.c
test_RunInput_LDADD = \ test_RunInput_LDADD = \

2
src/DatabaseSave.cxx
View File

@ -23,10 +23,10 @@
#include "Directory.hxx" #include "Directory.hxx"
#include "DirectorySave.hxx" #include "DirectorySave.hxx"
#include "song.h" #include "song.h"
#include "TextFile.hxx"
extern "C" { extern "C" {
#include "path.h" #include "path.h"
#include "text_file.h"
#include "tag.h" #include "tag.h"
#include "tag_internal.h" #include "tag_internal.h"
} }

5
src/DirectorySave.cxx
View File

@ -23,10 +23,7 @@
#include "song.h" #include "song.h"
#include "SongSave.hxx" #include "SongSave.hxx"
#include "PlaylistDatabase.hxx" #include "PlaylistDatabase.hxx"
#include "TextFile.hxx"
extern "C" {
#include "text_file.h"
}
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>

2
src/PlaylistDatabase.cxx
View File

@ -20,9 +20,9 @@
#include "config.h" #include "config.h"
#include "PlaylistDatabase.hxx" #include "PlaylistDatabase.hxx"
#include "PlaylistVector.hxx" #include "PlaylistVector.hxx"
#include "TextFile.hxx"
extern "C" { extern "C" {
#include "text_file.h"
#include "string_util.h" #include "string_util.h"
} }

2
src/PlaylistFile.cxx
View File

@ -25,9 +25,9 @@
#include "song.h" #include "song.h"
#include "io_error.h" #include "io_error.h"
#include "Mapper.hxx" #include "Mapper.hxx"
#include "TextFile.hxx"
extern "C" { extern "C" {
#include "text_file.h"
#include "path.h" #include "path.h"
#include "uri.h" #include "uri.h"
#include "idle.h" #include "idle.h"

2
src/PlaylistState.cxx
View File

@ -25,11 +25,11 @@
#include "config.h" #include "config.h"
#include "PlaylistState.hxx" #include "PlaylistState.hxx"
#include "QueueSave.hxx" #include "QueueSave.hxx"
#include "TextFile.hxx"
extern "C" { extern "C" {
#include "playlist.h" #include "playlist.h"
#include "player_control.h" #include "player_control.h"
#include "text_file.h"
#include "conf.h" #include "conf.h"
} }

2
src/QueueSave.cxx
View File

@ -23,11 +23,11 @@
#include "SongSave.hxx" #include "SongSave.hxx"
#include "DatabasePlugin.hxx" #include "DatabasePlugin.hxx"
#include "DatabaseGlue.hxx" #include "DatabaseGlue.hxx"
#include "TextFile.hxx"
extern "C" { extern "C" {
#include "queue.h" #include "queue.h"
#include "uri.h" #include "uri.h"
#include "text_file.h"
} }
#include <stdlib.h> #include <stdlib.h>

2
src/SongSave.cxx
View File

@ -22,10 +22,10 @@
#include "song.h" #include "song.h"
#include "TagSave.hxx" #include "TagSave.hxx"
#include "Directory.hxx" #include "Directory.hxx"
#include "TextFile.hxx"
extern "C" { extern "C" {
#include "tag.h" #include "tag.h"
#include "text_file.h"
#include "string_util.h" #include "string_util.h"
} }

2
src/StateFile.cxx
View File

@ -22,10 +22,10 @@
#include "OutputState.hxx" #include "OutputState.hxx"
#include "playlist.h" #include "playlist.h"
#include "PlaylistState.hxx" #include "PlaylistState.hxx"
#include "TextFile.hxx"
extern "C" { extern "C" {
#include "volume.h" #include "volume.h"
#include "text_file.h"
} }
#include <glib.h> #include <glib.h>

4
src/text_file.c → src/TextFile.cxx
View File

@ -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 * 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 @@
*/ */
#include "config.h" #include "config.h"
#include "text_file.h" #include "TextFile.hxx"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>

6
src/text_file.h → src/TextFile.hxx
View File

@ -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 * 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 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_TEXT_FILE_H #ifndef MPD_TEXT_FILE_HXX
#define MPD_TEXT_FILE_H #define MPD_TEXT_FILE_HXX
#include <glib.h> #include <glib.h>