diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/PlayerCommands.cxx | 2 | ||||
| -rw-r--r-- | src/PlaylistCommands.cxx | 2 | ||||
| -rw-r--r-- | src/PlaylistPrint.cxx (renamed from src/playlist_print.c) | 9 | ||||
| -rw-r--r-- | src/PlaylistPrint.hxx (renamed from src/playlist_print.h) | 6 | ||||
| -rw-r--r-- | src/QueueCommands.cxx | 2 |
6 files changed, 13 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index ab1d11032..2f015ed80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -154,7 +154,6 @@ mpd_headers = \ src/playlist.h \ src/playlist_error.h \ src/playlist_internal.h \ - src/playlist_print.h \ src/playlist_save.h \ src/playlist_state.h \ src/playlist_plugin.h \ @@ -324,7 +323,7 @@ src_mpd_SOURCES = \ src/playlist_global.c \ src/playlist_control.c \ src/playlist_edit.c \ - src/playlist_print.c \ + src/PlaylistPrint.cxx src/PlaylistPrint.hxx \ src/playlist_save.c \ src/playlist_mapper.c \ src/playlist_any.c \ diff --git a/src/PlayerCommands.cxx b/src/PlayerCommands.cxx index 6413b1aba..030e8016d 100644 --- a/src/PlayerCommands.cxx +++ b/src/PlayerCommands.cxx @@ -20,13 +20,13 @@ #include "config.h" #include "PlayerCommands.hxx" #include "CommandError.h" +#include "PlaylistPrint.hxx" extern "C" { #include "protocol/argparser.h" #include "protocol/result.h" #include "player_control.h" #include "playlist.h" -#include "playlist_print.h" #include "update.h" #include "volume.h" #include "client.h" diff --git a/src/PlaylistCommands.cxx b/src/PlaylistCommands.cxx index d74036ec3..d6be3ff30 100644 --- a/src/PlaylistCommands.cxx +++ b/src/PlaylistCommands.cxx @@ -21,12 +21,12 @@ #include "PlaylistCommands.hxx" #include "DatabasePlaylist.hxx" #include "CommandError.h" +#include "PlaylistPrint.hxx" extern "C" { #include "protocol/argparser.h" #include "protocol/result.h" #include "playlist.h" -#include "playlist_print.h" #include "playlist_save.h" #include "playlist_queue.h" #include "time_print.h" diff --git a/src/playlist_print.c b/src/PlaylistPrint.cxx index b1b689893..9ff7f270e 100644 --- a/src/playlist_print.c +++ b/src/PlaylistPrint.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2012 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,9 @@ */ #include "config.h" -#include "playlist_print.h" +#include "PlaylistPrint.hxx" + +extern "C" { #include "playlist_list.h" #include "playlist_plugin.h" #include "playlist_any.h" @@ -31,6 +33,7 @@ #include "database.h" #include "client.h" #include "input_stream.h" +} void playlist_print_uris(struct client *client, const struct playlist *playlist) @@ -120,7 +123,7 @@ spl_print(struct client *client, const char *name_utf8, bool detail, return false; for (unsigned i = 0; i < list->len; ++i) { - const char *temp = g_ptr_array_index(list, i); + const char *temp = (const char *)g_ptr_array_index(list, i); bool wrote = false; if (detail) { diff --git a/src/playlist_print.h b/src/PlaylistPrint.hxx index 20d3703d9..c6be5a93f 100644 --- a/src/playlist_print.h +++ b/src/PlaylistPrint.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2012 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 PLAYLIST_PRINT_H -#define PLAYLIST_PRINT_H +#ifndef MPD_PLAYLIST_PRINT_HXX +#define MPD_PLAYLIST_PRINT_HXX #include <glib.h> #include <stdbool.h> diff --git a/src/QueueCommands.cxx b/src/QueueCommands.cxx index 4801d2326..c47454e08 100644 --- a/src/QueueCommands.cxx +++ b/src/QueueCommands.cxx @@ -22,12 +22,12 @@ #include "CommandError.h" #include "DatabaseQueue.hxx" #include "SongFilter.hxx" +#include "PlaylistPrint.hxx" extern "C" { #include "protocol/argparser.h" #include "protocol/result.h" #include "playlist.h" -#include "playlist_print.h" #include "ls.h" #include "uri.h" #include "client_internal.h" |