Skip to content

Commit

Permalink
Removed specific versioning at libfmt use
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidmoreno
davidmoreno committed Feb 16, 2024
1 parent 88d191c commit 7d44db9
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions src/aseq.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,22 +595,22 @@ void mididata_to_alsaevents_t::ev_to_mididata(snd_seq_event_t *ev,

} // namespace rtpmididns

fmt::v9::appender
fmt::appender
fmt::formatter<rtpmididns::aseq_t::port_t>::format(rtpmididns::aseq_t::port_t c,
format_context &ctx) {
auto name = fmt::format("port_t[{}, {}]", c.client, c.port);
return formatter<std::string_view>::format(name, ctx);
}

fmt::v9::appender fmt::formatter<rtpmididns::aseq_t::client_type_e>::format(
fmt::appender fmt::formatter<rtpmididns::aseq_t::client_type_e>::format(
rtpmididns::aseq_t::client_type_e c, format_context &ctx) {
auto name = c == rtpmididns::aseq_t::client_type_e::TYPE_HARDWARE
? "TYPE_HARDWARE"
: "TYPE_SOFTWARE";
return formatter<std::string_view>::format(name, ctx);
}

fmt::v9::appender fmt::formatter<rtpmididns::aseq_t::connection_t>::format(
fmt::appender fmt::formatter<rtpmididns::aseq_t::connection_t>::format(
const rtpmididns::aseq_t::connection_t &c, format_context &ctx) {
auto name =
fmt::format("connection_t[{}, {} -> {}]", c.connected, c.from, c.to);
Expand Down
6 changes: 3 additions & 3 deletions src/aseq.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,19 +174,19 @@ template <> struct hash<rtpmididns::aseq_t::port_t> {
template <>
struct fmt::formatter<rtpmididns::aseq_t::port_t>
: formatter<std::string_view> {
fmt::v9::appender format(rtpmididns::aseq_t::port_t c, format_context &ctx);
fmt::appender format(rtpmididns::aseq_t::port_t c, format_context &ctx);
};

template <>
struct fmt::formatter<rtpmididns::aseq_t::client_type_e>
: formatter<std::string_view> {
fmt::v9::appender format(rtpmididns::aseq_t::client_type_e c,
fmt::appender format(rtpmididns::aseq_t::client_type_e c,
format_context &ctx);
};

template <>
struct fmt::formatter<rtpmididns::aseq_t::connection_t>
: formatter<std::string_view> {
fmt::v9::appender format(const rtpmididns::aseq_t::connection_t &c,
fmt::appender format(const rtpmididns::aseq_t::connection_t &c,
format_context &ctx);
};
18 changes: 9 additions & 9 deletions src/settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@

#include "settings.hpp"

fmt::v9::appender
fmt::appender
fmt::formatter<rtpmididns::settings_t::alsa_announce_t>::format(
const rtpmididns::settings_t::alsa_announce_t &data, format_context &ctx) {

return fmt::format_to(ctx.out(), "[alsa_announce_t {}]", data.name);
}

fmt::v9::appender
fmt::appender
fmt::formatter<std::vector<rtpmididns::settings_t::alsa_announce_t>>::format(
const std::vector<rtpmididns::settings_t::alsa_announce_t> &data,
format_context &ctx) {
Expand All @@ -37,7 +37,7 @@ fmt::formatter<std::vector<rtpmididns::settings_t::alsa_announce_t>>::format(
return fmt::format_to(ctx.out(), "{}", result);
}

fmt::v9::appender
fmt::appender
fmt::formatter<rtpmididns::settings_t::rtpmidi_announce_t>::format(
const rtpmididns::settings_t::rtpmidi_announce_t &data,
format_context &ctx) {
Expand All @@ -46,7 +46,7 @@ fmt::formatter<rtpmididns::settings_t::rtpmidi_announce_t>::format(
data.port);
}

fmt::v9::appender
fmt::appender
fmt::formatter<std::vector<rtpmididns::settings_t::rtpmidi_announce_t>>::format(
const std::vector<rtpmididns::settings_t::rtpmidi_announce_t> &data,
format_context &ctx) {
Expand All @@ -58,14 +58,14 @@ fmt::formatter<std::vector<rtpmididns::settings_t::rtpmidi_announce_t>>::format(
return fmt::format_to(ctx.out(), "{}", result);
}

fmt::v9::appender fmt::formatter<rtpmididns::settings_t::connect_to_t>::format(
fmt::appender fmt::formatter<rtpmididns::settings_t::connect_to_t>::format(
const rtpmididns::settings_t::connect_to_t &data, format_context &ctx) {

return fmt::format_to(ctx.out(), "[connect_to_t {} {} {}]", data.hostname,
data.port, data.name);
}

fmt::v9::appender
fmt::appender
fmt::formatter<std::vector<rtpmididns::settings_t::connect_to_t>>::format(
const std::vector<rtpmididns::settings_t::connect_to_t> &data,
format_context &ctx) {
Expand All @@ -78,7 +78,7 @@ fmt::formatter<std::vector<rtpmididns::settings_t::connect_to_t>>::format(
return fmt::format_to(ctx.out(), "{}", result);
}

fmt::v9::appender fmt::formatter<rtpmididns::settings_t>::format(
fmt::appender fmt::formatter<rtpmididns::settings_t>::format(
const rtpmididns::settings_t &data, format_context &ctx) {
return fmt::format_to(ctx.out(),
"[settings_t: alsa_name: {}, alsa_network: {}, "
Expand All @@ -91,7 +91,7 @@ fmt::v9::appender fmt::formatter<rtpmididns::settings_t>::format(
data.alsa_hw_auto_export);
}

fmt::v9::appender
fmt::appender
fmt::formatter<rtpmididns::settings_t::alsa_hw_auto_export_t>::format(
const rtpmididns::settings_t::alsa_hw_auto_export_t &data,
format_context &ctx) {
Expand All @@ -107,7 +107,7 @@ fmt::formatter<rtpmididns::settings_t::alsa_hw_auto_export_t>::format(
return fmt::format_to(ctx.out(), "{}", result);
}

fmt::v9::appender
fmt::appender
fmt::formatter<rtpmididns::settings_t::alsa_hw_auto_export_type_e>::format(
const rtpmididns::settings_t::alsa_hw_auto_export_type_e &data,
format_context &ctx) {
Expand Down
18 changes: 9 additions & 9 deletions src/settings.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,67 +77,67 @@ extern settings_t settings; // NOLINT
template <>
struct fmt::formatter<rtpmididns::settings_t::alsa_announce_t>
: formatter<std::string_view> {
fmt::v9::appender format(const rtpmididns::settings_t::alsa_announce_t &data,
fmt::appender format(const rtpmididns::settings_t::alsa_announce_t &data,
format_context &ctx);
};

template <>
struct fmt::formatter<std::vector<rtpmididns::settings_t::alsa_announce_t>>
: formatter<std::string_view> {
fmt::v9::appender
fmt::appender
format(const std::vector<rtpmididns::settings_t::alsa_announce_t> &data,
format_context &ctx);
};

template <>
struct fmt::formatter<rtpmididns::settings_t::rtpmidi_announce_t>
: formatter<std::string_view> {
fmt::v9::appender
fmt::appender
format(const rtpmididns::settings_t::rtpmidi_announce_t &data,
format_context &ctx);
};

template <>
struct fmt::formatter<std::vector<rtpmididns::settings_t::rtpmidi_announce_t>>
: formatter<std::string_view> {
fmt::v9::appender
fmt::appender
format(const std::vector<rtpmididns::settings_t::rtpmidi_announce_t> &data,
format_context &ctx);
};

template <>
struct fmt::formatter<rtpmididns::settings_t::connect_to_t>
: formatter<std::string_view> {
fmt::v9::appender format(const rtpmididns::settings_t::connect_to_t &data,
fmt::appender format(const rtpmididns::settings_t::connect_to_t &data,
format_context &ctx);
};

template <>
struct fmt::formatter<std::vector<rtpmididns::settings_t::connect_to_t>>
: formatter<std::string_view> {
fmt::v9::appender
fmt::appender
format(const std::vector<rtpmididns::settings_t::connect_to_t> &data,
format_context &ctx);
};

template <>
struct fmt::formatter<rtpmididns::settings_t> : formatter<std::string_view> {
fmt::v9::appender format(const rtpmididns::settings_t &data,
fmt::appender format(const rtpmididns::settings_t &data,
format_context &ctx);
};

template <>
struct fmt::formatter<rtpmididns::settings_t::alsa_hw_auto_export_t>
: formatter<std::string_view> {
fmt::v9::appender
fmt::appender
format(const rtpmididns::settings_t::alsa_hw_auto_export_t &data,
format_context &ctx);
};

template <>
struct fmt::formatter<rtpmididns::settings_t::alsa_hw_auto_export_type_e>
: formatter<std::string_view> {
fmt::v9::appender
fmt::appender
format(const rtpmididns::settings_t::alsa_hw_auto_export_type_e &data,
format_context &ctx);
};

0 comments on commit 7d44db9

Please sign in to comment.