aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-03 17:31:38 +0100
committerMax Kellermann <max@duempel.org>2013-01-03 17:31:38 +0100
commit1e0ea57dc4a75f846dc417996a3ec7bd18112098 (patch)
tree2a3171bfb7d7aa02d24d0474f16886be768fa417
parent70b87f2eb620bdf1d7e07141914feb2316794fb3 (diff)
downloadmpd-1e0ea57dc4a75f846dc417996a3ec7bd18112098.tar.gz
mpd-1e0ea57dc4a75f846dc417996a3ec7bd18112098.tar.xz
mpd-1e0ea57dc4a75f846dc417996a3ec7bd18112098.zip
cmdline: convert to C++
-rw-r--r--Makefile.am3
-rw-r--r--src/CommandLine.cxx (renamed from src/cmdline.c)12
-rw-r--r--src/CommandLine.hxx (renamed from src/cmdline.h)8
-rw-r--r--src/Main.cxx2
4 files changed, 13 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index c0d59d806..e37b6369e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,6 @@ mpd_headers = \
src/filter/volume_filter_plugin.h \
src/command.h \
src/idle.h \
- src/cmdline.h \
src/conf.h \
src/crossfade.h \
src/decoder_control.h \
@@ -202,7 +201,7 @@ src_mpd_SOURCES = \
src/MessageCommands.cxx src/MessageCommands.hxx \
src/OtherCommands.cxx src/OtherCommands.hxx \
src/idle.c \
- src/cmdline.c \
+ src/CommandLine.cxx src/CommandLine.hxx \
src/conf.c \
src/crossfade.c \
src/cue/cue_parser.c src/cue/cue_parser.h \
diff --git a/src/cmdline.c b/src/CommandLine.cxx
index a972daf95..ea5432f92 100644
--- a/src/cmdline.c
+++ b/src/CommandLine.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,10 +18,15 @@
*/
#include "config.h"
-#include "cmdline.h"
+#include "CommandLine.hxx"
#include "path.h"
+
+extern "C" {
#include "log.h"
#include "conf.h"
+#include "ls.h"
+}
+
#include "decoder_list.h"
#include "decoder_plugin.h"
#include "output_list.h"
@@ -30,7 +35,6 @@
#include "input_plugin.h"
#include "playlist_list.h"
#include "playlist_plugin.h"
-#include "ls.h"
#include "mpd_error.h"
#include "glib_compat.h"
@@ -159,7 +163,7 @@ parse_cmdline(int argc, char **argv, struct options *options,
"verbose logging", NULL },
{ "version", 'V', 0, G_OPTION_ARG_NONE, &option_version,
"print version number", NULL },
- { .long_name = NULL }
+ { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
};
options->kill = false;
diff --git a/src/cmdline.h b/src/CommandLine.hxx
index 68f625a6c..7a8731f82 100644
--- a/src/cmdline.h
+++ b/src/CommandLine.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,13 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef CMDLINE_H
-#define CMDLINE_H
+#ifndef MPD_COMMAND_LINE_HXX
+#define MPD_COMMAND_LINE_HXX
#include <glib.h>
-#include <stdbool.h>
-
struct options {
gboolean kill;
gboolean daemon;
diff --git a/src/Main.cxx b/src/Main.cxx
index 668a140be..1974a6103 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -19,6 +19,7 @@
#include "config.h"
#include "Main.hxx"
+#include "CommandLine.hxx"
#include "PlaylistFile.hxx"
#include "UpdateGlue.hxx"
#include "chunk.h"
@@ -38,7 +39,6 @@ extern "C" {
#include "io_thread.h"
#include "idle.h"
#include "playlist.h"
-#include "cmdline.h"
#include "conf.h"
#include "path.h"
#include "player_control.h"