aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-12-15 17:20:56 +0100
committerMax Kellermann <max@duempel.org>2013-12-15 17:23:45 +0100
commit73555f9088120b35cfc84d582bd827a1a816a4b1 (patch)
tree8acc560e63c40e9b3e52213a905ed8eb9d3240cc
parente1ec65bd53db811bfc66d92346519c43a06b65c7 (diff)
downloadmpd-73555f9088120b35cfc84d582bd827a1a816a4b1.tar.gz
mpd-73555f9088120b35cfc84d582bd827a1a816a4b1.tar.xz
mpd-73555f9088120b35cfc84d582bd827a1a816a4b1.zip
Log: move enum LogLevel to LogLevel.hxx
Diffstat (limited to '')
-rw-r--r--Makefile.am1
-rw-r--r--src/Log.hxx37
-rw-r--r--src/LogLevel.hxx59
3 files changed, 61 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am
index 66f225dbc..1427835b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,6 +148,7 @@ src_mpd_SOURCES = \
src/Listen.cxx src/Listen.hxx \
src/LogInit.cxx src/LogInit.hxx \
src/Log.cxx src/Log.hxx src/LogV.hxx \
+ src/LogLevel.hxx \
src/ls.cxx src/ls.hxx \
src/IOThread.cxx src/IOThread.hxx \
src/Main.cxx src/Main.hxx \
diff --git a/src/Log.hxx b/src/Log.hxx
index 920a8d8a3..c8e166056 100644
--- a/src/Log.hxx
+++ b/src/Log.hxx
@@ -20,47 +20,12 @@
#ifndef MPD_LOG_HXX
#define MPD_LOG_HXX
+#include "LogLevel.hxx"
#include "Compiler.h"
-#ifdef WIN32
-#include <windows.h>
-/* damn you, windows.h! */
-#ifdef ERROR
-#undef ERROR
-#endif
-#endif
-
class Error;
class Domain;
-enum class LogLevel {
- /**
- * Debug message for developers.
- */
- DEBUG,
-
- /**
- * Unimportant informational message.
- */
- INFO,
-
- /**
- * Interesting informational message.
- */
- DEFAULT,
-
- /**
- * Warning: something may be wrong.
- */
- WARNING,
-
- /**
- * An error has occurred, an operation could not finish
- * successfully.
- */
- ERROR,
-};
-
void
Log(const Domain &domain, LogLevel level, const char *msg);
diff --git a/src/LogLevel.hxx b/src/LogLevel.hxx
new file mode 100644
index 000000000..dd24cc384
--- /dev/null
+++ b/src/LogLevel.hxx
@@ -0,0 +1,59 @@
+/*
+ * 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
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_LOG_LEVEL_HXX
+#define MPD_LOG_LEVEL_HXX
+
+#ifdef WIN32
+#include <windows.h>
+/* damn you, windows.h! */
+#ifdef ERROR
+#undef ERROR
+#endif
+#endif
+
+enum class LogLevel {
+ /**
+ * Debug message for developers.
+ */
+ DEBUG,
+
+ /**
+ * Unimportant informational message.
+ */
+ INFO,
+
+ /**
+ * Interesting informational message.
+ */
+ DEFAULT,
+
+ /**
+ * Warning: something may be wrong.
+ */
+ WARNING,
+
+ /**
+ * An error has occurred, an operation could not finish
+ * successfully.
+ */
+ ERROR,
+};
+
+#endif