playlist_{any,song,queue}: convert to C++

Makefile.am

@@ -151,9 +151,6 @@ mpd_headers = \
 	src/playlist_state.h \
 	src/playlist_plugin.h \
 	src/playlist_list.h \
-	src/playlist_any.h \
-	src/playlist_song.h \
-	src/playlist_queue.h \
 	src/playlist_vector.h \
 	src/playlist_database.h \
 	src/playlist/extm3u_playlist_plugin.h \
@@ -317,11 +314,11 @@ src_mpd_SOURCES = \
 	src/playlist_edit.c \
 	src/PlaylistPrint.cxx src/PlaylistPrint.hxx \
 	src/PlaylistSave.cxx src/PlaylistSave.hxx \
-	src/PlaylistMapper.cxx src/PlaylistMapper.h \
-	src/playlist_any.c \
-	src/playlist_song.c \
+	src/PlaylistMapper.cxx src/PlaylistMapper.hxx \
+	src/PlaylistAny.cxx src/PlaylistAny.hxx \
+	src/PlaylistSong.cxx src/PlaylistSong.hxx \
 	src/playlist_state.c \
-	src/playlist_queue.c \
+	src/PlaylistQueue.cxx src/PlaylistQueue.hxx \
 	src/playlist_vector.c \
 	src/playlist_database.c \
 	src/queue.c \

src/playlist_any.c → src/PlaylistAny.cxx

 /*
- * 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,11 +18,14 @@
  */
 
 #include "config.h"
-#include "playlist_any.h"
+#include "PlaylistAny.hxx"
+#include "PlaylistMapper.hxx"
+
+extern "C" {
 #include "playlist_list.h"
-#include "PlaylistMapper.h"
 #include "uri.h"
 #include "input_stream.h"
+}
 
 #include <assert.h>
 

src/playlist_any.h → src/PlaylistAny.hxx

 /*
- * 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_PLAYLIST_ANY_H
-#define MPD_PLAYLIST_ANY_H
+#ifndef MPD_PLAYLIST_ANY_HXX
+#define MPD_PLAYLIST_ANY_HXX
 
 #include <glib.h>
 

src/PlaylistCommands.cxx

 /*
- * Copyright (C) 2003-2012 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
@@ -24,12 +24,12 @@
 #include "PlaylistPrint.hxx"
 #include "PlaylistSave.hxx"
 #include "PlaylistFile.hxx"
+#include "PlaylistQueue.hxx"
 
 extern "C" {
 #include "protocol/argparser.h"
 #include "protocol/result.h"
 #include "playlist.h"
-#include "playlist_queue.h"
 #include "time_print.h"
 #include "ls.h"
 #include "uri.h"

src/PlaylistMapper.cxx

 /*
- * Copyright (C) 2003-2012 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,7 +18,7 @@
  */
 
 #include "config.h"
-#include "PlaylistMapper.h"
+#include "PlaylistMapper.hxx"
 #include "PlaylistFile.hxx"
 
 extern "C" {

src/PlaylistMapper.h → src/PlaylistMapper.hxx

 /*
- * Copyright (C) 2003-2012 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,15 +17,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_PLAYLIST_MAPPER_H
-#define MPD_PLAYLIST_MAPPER_H
+#ifndef MPD_PLAYLIST_MAPPER_HXX
+#define MPD_PLAYLIST_MAPPER_HXX
 
 #include <glib.h>
 
 struct input_stream;
 
-G_BEGIN_DECLS
-
 /**
  * Opens a playlist from an URI relative to the playlist or music
  * directory.
@@ -38,6 +36,4 @@ struct playlist_provider *
 playlist_mapper_open(const char *uri, GMutex *mutex, GCond *cond,
 		     struct input_stream **is_r);
 
-G_END_DECLS
-
 #endif

src/PlaylistPrint.cxx

 /*
- * Copyright (C) 2003-2012 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
@@ -20,13 +20,13 @@
 #include "config.h"
 #include "PlaylistPrint.hxx"
 #include "PlaylistFile.hxx"
+#include "PlaylistAny.hxx"
+#include "PlaylistSong.hxx"
 #include "QueuePrint.hxx"
 
 extern "C" {
 #include "playlist_list.h"
 #include "playlist_plugin.h"
-#include "playlist_any.h"
-#include "playlist_song.h"
 #include "playlist.h"
 #include "song_print.h"
 #include "song.h"

src/playlist_queue.c → src/PlaylistQueue.cxx

 /*
- * 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,13 +18,16 @@
  */
 
 #include "config.h"
-#include "playlist_queue.h"
+#include "PlaylistQueue.hxx"
 #include "playlist_plugin.h"
-#include "playlist_any.h"
-#include "playlist_song.h"
+#include "PlaylistAny.hxx"
+#include "PlaylistSong.hxx"
+
+extern "C" {
 #include "playlist.h"
 #include "song.h"
 #include "input_stream.h"
+}
 
 enum playlist_result
 playlist_load_into_queue(const char *uri, struct playlist_provider *source,

src/playlist_queue.h → src/PlaylistQueue.hxx

 /*
- * 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
@@ -21,8 +21,8 @@
  * \brief Glue between playlist plugin and the play queue
  */
 
-#ifndef MPD_PLAYLIST_QUEUE_H
-#define MPD_PLAYLIST_QUEUE_H
+#ifndef MPD_PLAYLIST_QUEUE_HXX
+#define MPD_PLAYLIST_QUEUE_HXX
 
 #include "playlist_error.h"
 

src/playlist_song.c → src/PlaylistSong.cxx

 /*
- * 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,7 +18,9 @@
  */
 
 #include "config.h"
-#include "playlist_song.h"
+#include "PlaylistSong.hxx"
+
+extern "C" {
 #include "database.h"
 #include "mapper.h"
 #include "song.h"
@@ -26,6 +28,7 @@
 #include "path.h"
 #include "ls.h"
 #include "tag.h"
+}
 
 #include <assert.h>
 #include <string.h>

src/playlist_song.h → src/PlaylistSong.hxx

 /*
- * 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_PLAYLIST_SONG_H
-#define MPD_PLAYLIST_SONG_H
+#ifndef MPD_PLAYLIST_SONG_HXX
+#define MPD_PLAYLIST_SONG_HXX
 
 #include <stdbool.h>