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

*_print: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-02 20:29:24 +01:00
parent 0023dffd0b
commit 3bbb502387
13 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -162,9 +162,8 @@ mpd_headers = \
src/replay_gain_info.h \ src/replay_gain_info.h \
src/replay_gain_ape.h \ src/replay_gain_ape.h \
src/sig_handlers.h \ src/sig_handlers.h \
src/time_print.c src/time_print.h \ src/TimePrint.cxx src/TimePrint.hxx \
src/song.h \ src/song.h \
src/song_print.h \
src/song_sticker.h \ src/song_sticker.h \
src/song_sort.c src/song_sort.h \ src/song_sort.c src/song_sort.h \
src/socket_util.h \ src/socket_util.h \
@ -178,7 +177,6 @@ mpd_headers = \
src/tag_ape.h \ src/tag_ape.h \
src/tag_id3.h \ src/tag_id3.h \
src/tag_rva2.h \ src/tag_rva2.h \
src/tag_print.h \
src/tokenizer.h \ src/tokenizer.h \
src/strset.h \ src/strset.h \
src/uri.h \ src/uri.h \
@ -316,7 +314,7 @@ src_mpd_SOURCES = \
src/sig_handlers.c \ src/sig_handlers.c \
src/Song.cxx \ src/Song.cxx \
src/song_update.c \ src/song_update.c \
src/song_print.c \ src/SongPrint.cxx src/SongPrint.hxx \
src/SongSave.cxx src/SongSave.hxx \ src/SongSave.cxx src/SongSave.hxx \
src/resolver.c src/resolver.h \ src/resolver.c src/resolver.h \
src/socket_util.c \ src/socket_util.c \
@ -324,7 +322,7 @@ src_mpd_SOURCES = \
src/Stats.cxx \ src/Stats.cxx \
src/tag.c \ src/tag.c \
src/tag_pool.c \ src/tag_pool.c \
src/tag_print.c \ src/TagPrint.cxx src/TagPrint.hxx \
src/TagSave.cxx src/TagSave.hxx \ src/TagSave.cxx src/TagSave.hxx \
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 \

4
src/DatabasePrint.cxx
View File

@ -22,13 +22,13 @@
#include "DatabaseSelection.hxx" #include "DatabaseSelection.hxx"
#include "SongFilter.hxx" #include "SongFilter.hxx"
#include "PlaylistVector.hxx" #include "PlaylistVector.hxx"
#include "SongPrint.hxx"
#include "TimePrint.hxx"
extern "C" { extern "C" {
#include "database.h" #include "database.h"
#include "client.h" #include "client.h"
#include "song.h" #include "song.h"
#include "song_print.h"
#include "time_print.h"
#include "tag.h" #include "tag.h"
} }

6
src/OtherCommands.cxx
View File

@ -24,11 +24,13 @@
#include "UpdateGlue.hxx" #include "UpdateGlue.hxx"
#include "directory.h" #include "directory.h"
#include "song.h" #include "song.h"
#include "SongPrint.hxx"
#include "TagPrint.hxx"
#include "TimePrint.hxx"
extern "C" { extern "C" {
#include "protocol/argparser.h" #include "protocol/argparser.h"
#include "protocol/result.h" #include "protocol/result.h"
#include "time_print.h"
#include "ls.h" #include "ls.h"
#include "uri.h" #include "uri.h"
#include "decoder_print.h" #include "decoder_print.h"
@ -43,10 +45,8 @@ extern "C" {
#include "client.h" #include "client.h"
#include "client_idle.h" #include "client_idle.h"
#include "client_file.h" #include "client_file.h"
#include "tag_print.h"
#include "idle.h" #include "idle.h"
#include "mapper.h" #include "mapper.h"
#include "song_print.h"
} }
#ifdef ENABLE_SQLITE #ifdef ENABLE_SQLITE

2
src/PlaylistCommands.cxx
View File

@ -25,12 +25,12 @@
#include "PlaylistSave.hxx" #include "PlaylistSave.hxx"
#include "PlaylistFile.hxx" #include "PlaylistFile.hxx"
#include "PlaylistQueue.hxx" #include "PlaylistQueue.hxx"
#include "TimePrint.hxx"
extern "C" { extern "C" {
#include "protocol/argparser.h" #include "protocol/argparser.h"
#include "protocol/result.h" #include "protocol/result.h"
#include "playlist.h" #include "playlist.h"
#include "time_print.h"
#include "ls.h" #include "ls.h"
#include "uri.h" #include "uri.h"
#include "client_internal.h" #include "client_internal.h"

2
src/PlaylistPrint.cxx
View File

@ -23,12 +23,12 @@
#include "PlaylistAny.hxx" #include "PlaylistAny.hxx"
#include "PlaylistSong.hxx" #include "PlaylistSong.hxx"
#include "QueuePrint.hxx" #include "QueuePrint.hxx"
#include "SongPrint.hxx"
extern "C" { extern "C" {
#include "playlist_list.h" #include "playlist_list.h"
#include "playlist_plugin.h" #include "playlist_plugin.h"
#include "playlist.h" #include "playlist.h"
#include "song_print.h"
#include "song.h" #include "song.h"
#include "database.h" #include "database.h"
#include "client.h" #include "client.h"

2
src/QueuePrint.cxx
View File

@ -20,11 +20,11 @@
#include "config.h" #include "config.h"
#include "QueuePrint.hxx" #include "QueuePrint.hxx"
#include "SongFilter.hxx" #include "SongFilter.hxx"
#include "SongPrint.hxx"
extern "C" { extern "C" {
#include "queue.h" #include "queue.h"
#include "song.h" #include "song.h"
#include "song_print.h"
#include "client.h" #include "client.h"
#include "mapper.h" #include "mapper.h"
} }

11
src/song_print.c → src/SongPrint.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,14 +18,17 @@
*/ */
#include "config.h" #include "config.h"
#include "song_print.h" #include "SongPrint.hxx"
#include "time_print.h"
#include "song.h" #include "song.h"
#include "directory.h" #include "directory.h"
#include "tag_print.h" #include "TimePrint.hxx"
#include "TagPrint.hxx"
extern "C" {
#include "client.h" #include "client.h"
#include "uri.h" #include "uri.h"
#include "mapper.h" #include "mapper.h"
}
void void
song_print_uri(struct client *client, struct song *song) song_print_uri(struct client *client, struct song *song)

7
src/song_print.h → src/SongPrint.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,12 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_SONG_PRINT_H #ifndef MPD_SONG_PRINT_HXX
#define MPD_SONG_PRINT_H #define MPD_SONG_PRINT_HXX
struct client; struct client;
struct song; struct song;
struct songvec;
void void
song_print_info(struct client *client, struct song *song); song_print_info(struct client *client, struct song *song);

2
src/StickerCommands.cxx
View File

@ -19,12 +19,12 @@
#include "config.h" #include "config.h"
#include "StickerCommands.hxx" #include "StickerCommands.hxx"
#include "SongPrint.hxx"
extern "C" { extern "C" {
#include "protocol/result.h" #include "protocol/result.h"
#include "sticker.h" #include "sticker.h"
#include "sticker_print.h" #include "sticker_print.h"
#include "song_print.h"
#include "song_sticker.h" #include "song_sticker.h"
#include "database.h" #include "database.h"
#include "db_lock.h" #include "db_lock.h"

9
src/tag_print.c → src/TagPrint.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,12 +18,15 @@
*/ */
#include "config.h" #include "config.h"
#include "tag_print.h" #include "TagPrint.hxx"
#include "tag.h" #include "tag.h"
#include "tag_internal.h" #include "tag_internal.h"
#include "client.h"
#include "song.h" #include "song.h"
extern "C" {
#include "client.h"
}
void tag_print_types(struct client *client) void tag_print_types(struct client *client)
{ {
int i; int i;

6
src/tag_print.h → src/TagPrint.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_TAG_PRINT_H #ifndef MPD_TAG_PRINT_HXX
#define MPD_TAG_PRINT_H #define MPD_TAG_PRINT_HXX
struct tag; struct tag;
struct client; struct client;

7
src/time_print.c → src/TimePrint.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,8 +18,11 @@
*/ */
#include "config.h" #include "config.h"
#include "time_print.h" #include "TimePrint.hxx"
extern "C" {
#include "client.h" #include "client.h"
}
#include <glib.h> #include <glib.h>

6
src/time_print.h → src/TimePrint.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_TIME_PRINT_H #ifndef MPD_TIME_PRINT_HXX
#define MPD_TIME_PRINT_H #define MPD_TIME_PRINT_HXX
#include <time.h> #include <time.h>