Log: add libfmt support

src/lib/ffmpeg/meson.build

@@ -41,6 +41,7 @@ ffmpeg = static_library(
     libavcodec_dep,
     libavfilter_dep,
     libavutil_dep,
+    log_dep,
   ],
 )
 

src/lib/fmt/AudioFormatFormatter.hxx

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021 Max Kellermann <max.kellermann@gmail.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AUDIO_FORMAT_FORMATTER_HXX
+#define AUDIO_FORMAT_FORMATTER_HXX
+
+#include "pcm/AudioFormat.hxx"
+#include "util/StringBuffer.hxx"
+
+#include <fmt/format.h>
+
+template<>
+struct fmt::formatter<AudioFormat> : formatter<string_view>
+{
+	template<typename FormatContext>
+	auto format(const AudioFormat &af, FormatContext &ctx) {
+		return formatter<string_view>::format(ToString(af).c_str(),
+						      ctx);
+	}
+};
+
+#endif

src/lib/fmt/ExceptionFormatter.hxx

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2021 Max Kellermann <max.kellermann@gmail.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef EXCEPTION_FORMATTER_HXX
+#define EXCEPTION_FORMATTER_HXX
+
+#include "util/Exception.hxx"
+
+#include <fmt/format.h>
+
+template<>
+struct fmt::formatter<std::exception_ptr> : formatter<string_view>
+{
+	template<typename FormatContext>
+	auto format(std::exception_ptr e, FormatContext &ctx) {
+		return formatter<string_view>::format(GetFullMessage(e), ctx);
+	}
+};
+
+#endif

src/lib/fmt/PathFormatter.hxx

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2003-2021 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 PATH_FORMATTER_HXX
+#define PATH_FORMATTER_HXX
+
+#include "fs/Path.hxx"
+#include "fs/AllocatedPath.hxx"
+
+#include <fmt/format.h>
+
+template<>
+struct fmt::formatter<Path> : formatter<string_view>
+{
+	template<typename FormatContext>
+	auto format(Path path, FormatContext &ctx) {
+		return formatter<string_view>::format(path.ToUTF8(), ctx);
+	}
+};
+
+template<>
+struct fmt::formatter<AllocatedPath> : formatter<Path> {};
+
+#endif

src/lib/nfs/meson.build

@@ -16,6 +16,7 @@ nfs = static_library(
   include_directories: inc,
   dependencies: [
     nfs_dep,
+    log_dep,
   ],
 )
 

src/lib/xiph/meson.build

@@ -124,6 +124,7 @@ if libflac_dep.found()
     include_directories: inc,
     dependencies: [
       libflac_dep,
+      log_dep,
     ],
   )