aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile.am8
-rw-r--r--src/DatabasePrint.cxx4
-rw-r--r--src/OtherCommands.cxx6
-rw-r--r--src/PlaylistCommands.cxx2
-rw-r--r--src/PlaylistPrint.cxx2
-rw-r--r--src/QueuePrint.cxx2
-rw-r--r--src/SongPrint.cxx (renamed from src/song_print.c)11
-rw-r--r--src/SongPrint.hxx (renamed from src/song_print.h)7
-rw-r--r--src/StickerCommands.cxx2
-rw-r--r--src/TagPrint.cxx (renamed from src/tag_print.c)9
-rw-r--r--src/TagPrint.hxx (renamed from src/tag_print.h)6
-rw-r--r--src/TimePrint.cxx (renamed from src/time_print.c)7
-rw-r--r--src/TimePrint.hxx (renamed from src/time_print.h)6
13 files changed, 39 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am
index 0b39fdf96..2b88016e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,9 +162,8 @@ mpd_headers = \
src/replay_gain_info.h \
src/replay_gain_ape.h \
src/sig_handlers.h \
- src/time_print.c src/time_print.h \
+ src/TimePrint.cxx src/TimePrint.hxx \
src/song.h \
- src/song_print.h \
src/song_sticker.h \
src/song_sort.c src/song_sort.h \
src/socket_util.h \
@@ -178,7 +177,6 @@ mpd_headers = \
src/tag_ape.h \
src/tag_id3.h \
src/tag_rva2.h \
- src/tag_print.h \
src/tokenizer.h \
src/strset.h \
src/uri.h \
@@ -316,7 +314,7 @@ src_mpd_SOURCES = \
src/sig_handlers.c \
src/Song.cxx \
src/song_update.c \
- src/song_print.c \
+ src/SongPrint.cxx src/SongPrint.hxx \
src/SongSave.cxx src/SongSave.hxx \
src/resolver.c src/resolver.h \
src/socket_util.c \
@@ -324,7 +322,7 @@ src_mpd_SOURCES = \
src/Stats.cxx \
src/tag.c \
src/tag_pool.c \
- src/tag_print.c \
+ 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 \
diff --git a/src/DatabasePrint.cxx b/src/DatabasePrint.cxx
index 980aa0124..87e41be8e 100644
--- a/src/DatabasePrint.cxx
+++ b/src/DatabasePrint.cxx
@@ -22,13 +22,13 @@
#include "DatabaseSelection.hxx"
#include "SongFilter.hxx"
#include "PlaylistVector.hxx"
+#include "SongPrint.hxx"
+#include "TimePrint.hxx"
extern "C" {
#include "database.h"
#include "client.h"
#include "song.h"
-#include "song_print.h"
-#include "time_print.h"
#include "tag.h"
}
diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx
index 8518f437f..c5aeeab2f 100644
--- a/src/OtherCommands.cxx
+++ b/src/OtherCommands.cxx
@@ -24,11 +24,13 @@
#include "UpdateGlue.hxx"
#include "directory.h"
#include "song.h"
+#include "SongPrint.hxx"
+#include "TagPrint.hxx"
+#include "TimePrint.hxx"
extern "C" {
#include "protocol/argparser.h"
#include "protocol/result.h"
-#include "time_print.h"
#include "ls.h"
#include "uri.h"
#include "decoder_print.h"
@@ -43,10 +45,8 @@ extern "C" {
#include "client.h"
#include "client_idle.h"
#include "client_file.h"
-#include "tag_print.h"
#include "idle.h"
#include "mapper.h"
-#include "song_print.h"
}
#ifdef ENABLE_SQLITE
diff --git a/src/PlaylistCommands.cxx b/src/PlaylistCommands.cxx
index ed2f47519..890beef79 100644
--- a/src/PlaylistCommands.cxx
+++ b/src/PlaylistCommands.cxx
@@ -25,12 +25,12 @@
#include "PlaylistSave.hxx"
#include "PlaylistFile.hxx"
#include "PlaylistQueue.hxx"
+#include "TimePrint.hxx"
extern "C" {
#include "protocol/argparser.h"
#include "protocol/result.h"
#include "playlist.h"
-#include "time_print.h"
#include "ls.h"
#include "uri.h"
#include "client_internal.h"
diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx
index 93970076f..88c0a0a06 100644
--- a/src/PlaylistPrint.cxx
+++ b/src/PlaylistPrint.cxx
@@ -23,12 +23,12 @@
#include "PlaylistAny.hxx"
#include "PlaylistSong.hxx"
#include "QueuePrint.hxx"
+#include "SongPrint.hxx"
extern "C" {
#include "playlist_list.h"
#include "playlist_plugin.h"
#include "playlist.h"
-#include "song_print.h"
#include "song.h"
#include "database.h"
#include "client.h"
diff --git a/src/QueuePrint.cxx b/src/QueuePrint.cxx
index edac7c7ad..32f131ae8 100644
--- a/src/QueuePrint.cxx
+++ b/src/QueuePrint.cxx
@@ -20,11 +20,11 @@
#include "config.h"
#include "QueuePrint.hxx"
#include "SongFilter.hxx"
+#include "SongPrint.hxx"
extern "C" {
#include "queue.h"
#include "song.h"
-#include "song_print.h"
#include "client.h"
#include "mapper.h"
}
diff --git a/src/song_print.c b/src/SongPrint.cxx
index d876b85a8..371952e86 100644
--- a/src/song_print.c
+++ b/src/SongPrint.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,14 +18,17 @@
*/
#include "config.h"
-#include "song_print.h"
-#include "time_print.h"
+#include "SongPrint.hxx"
#include "song.h"
#include "directory.h"
-#include "tag_print.h"
+#include "TimePrint.hxx"
+#include "TagPrint.hxx"
+
+extern "C" {
#include "client.h"
#include "uri.h"
#include "mapper.h"
+}
void
song_print_uri(struct client *client, struct song *song)
diff --git a/src/song_print.h b/src/SongPrint.hxx
index 8f1f0cc65..22a77d4af 100644
--- a/src/song_print.h
+++ b/src/SongPrint.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,12 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_SONG_PRINT_H
-#define MPD_SONG_PRINT_H
+#ifndef MPD_SONG_PRINT_HXX
+#define MPD_SONG_PRINT_HXX
struct client;
struct song;
-struct songvec;
void
song_print_info(struct client *client, struct song *song);
diff --git a/src/StickerCommands.cxx b/src/StickerCommands.cxx
index ccf18fea6..7d23354fc 100644
--- a/src/StickerCommands.cxx
+++ b/src/StickerCommands.cxx
@@ -19,12 +19,12 @@
#include "config.h"
#include "StickerCommands.hxx"
+#include "SongPrint.hxx"
extern "C" {
#include "protocol/result.h"
#include "sticker.h"
#include "sticker_print.h"
-#include "song_print.h"
#include "song_sticker.h"
#include "database.h"
#include "db_lock.h"
diff --git a/src/tag_print.c b/src/TagPrint.cxx
index 9a46b247a..9f25d95c6 100644
--- a/src/tag_print.c
+++ b/src/TagPrint.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,12 +18,15 @@
*/
#include "config.h"
-#include "tag_print.h"
+#include "TagPrint.hxx"
#include "tag.h"
#include "tag_internal.h"
-#include "client.h"
#include "song.h"
+extern "C" {
+#include "client.h"
+}
+
void tag_print_types(struct client *client)
{
int i;
diff --git a/src/tag_print.h b/src/TagPrint.hxx
index b9eeeaecf..861f84441 100644
--- a/src/tag_print.h
+++ b/src/TagPrint.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_TAG_PRINT_H
-#define MPD_TAG_PRINT_H
+#ifndef MPD_TAG_PRINT_HXX
+#define MPD_TAG_PRINT_HXX
struct tag;
struct client;
diff --git a/src/time_print.c b/src/TimePrint.cxx
index 6fb569d96..f9499980b 100644
--- a/src/time_print.c
+++ b/src/TimePrint.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,8 +18,11 @@
*/
#include "config.h"
-#include "time_print.h"
+#include "TimePrint.hxx"
+
+extern "C" {
#include "client.h"
+}
#include <glib.h>
diff --git a/src/time_print.h b/src/TimePrint.hxx
index 7eff446b2..07e1d301c 100644
--- a/src/time_print.h
+++ b/src/TimePrint.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_TIME_PRINT_H
-#define MPD_TIME_PRINT_H
+#ifndef MPD_TIME_PRINT_HXX
+#define MPD_TIME_PRINT_HXX
#include <time.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:47:09 +0000