aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-08-29 20:17:13 +0200
committerMax Kellermann <max@duempel.org>2012-08-29 20:17:13 +0200
commit04a9dec9525a58d077da71a84655cb45b7838520 (patch)
treea86127d5b42bf35cac006afa07afc087f9be8e6c /src
parent6ee76b7154a55b6bd12a4b695faed2bf49c2a5d5 (diff)
downloadmpd-04a9dec9525a58d077da71a84655cb45b7838520.tar.gz
mpd-04a9dec9525a58d077da71a84655cb45b7838520.tar.xz
mpd-04a9dec9525a58d077da71a84655cb45b7838520.zip
playlist_print: rename to PlaylistPrint.cxx
Diffstat (limited to 'src')
-rw-r--r--src/PlayerCommands.cxx2
-rw-r--r--src/PlaylistCommands.cxx2
-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.cxx2
5 files changed, 12 insertions, 9 deletions
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"