Attachment #790577 for bug #856700

View | Details | Raw Unified | Return to bug 856700
Collapse All | Expand All

Lines 221-223 protected: Link Here

(-)a/src/common/aac.h (+4 lines)
221	using parser_cptr = std::shared_ptr<parser_c>;	221	using parser_cptr = std::shared_ptr<parser_c>;
222		222
223	} // namespace mtx::aac	223	} // namespace mtx::aac
		224
		225	#if FMT_VERSION >= 90000
		226	template <> struct fmt::formatter<mtx::aac::header_c> : ostream_formatter {};
		227	#endif // FMT_VERSION >= 90000

Lines 176-178 struct hash<mtx::bcp47::language_c> { Link Here

(-)a/src/common/bcp47.h (+5 lines)
176	};	176	};
177		177
178	} // namespace mtx::bcp47	178	} // namespace mtx::bcp47
		179
		180	#if FMT_VERSION >= 90000
		181	template <> struct fmt::formatter<mtx::bcp47::language_c::extension_t> : ostream_formatter {};
		182	template <> struct fmt::formatter<mtx::bcp47::language_c> : ostream_formatter {};
		183	#endif // FMT_VERSION >= 90000

Lines 18-23 Link Here

(-)a/src/common/bluray/track_chapter_names.cpp (+1 lines)
18	#include "common/bluray/track_chapter_names.h"	18	#include "common/bluray/track_chapter_names.h"
19	#include "common/bluray/util.h"	19	#include "common/bluray/util.h"
20	#include "common/debugging.h"	20	#include "common/debugging.h"
		21	#include "common/path.h"
21	#include "common/qt.h"	22	#include "common/qt.h"
22	#include "common/xml/xml.h"	23	#include "common/xml/xml.h"
23		24

Lines 45-47 operator <<(std::ostream &out, Link Here

(-)a/src/common/error.h (+4 lines)
45	}	45	}
46		46
47	}	47	}
		48
		49	#if FMT_VERSION >= 90000
		50	template <> struct fmt::formatter<mtx::exception> : ostream_formatter {};
		51	#endif // FMT_VERSION >= 90000

Lines 83-85 operator <<(std::ostream &out, Link Here

(-)a/src/common/fourcc.h (+4 lines)
83	out << fourcc.str();	83	out << fourcc.str();
84	return out;	84	return out;
85	}	85	}
		86
		87	#if FMT_VERSION >= 90000
		88	template <> struct fmt::formatter<fourcc_c> : ostream_formatter {};
		89	#endif // FMT_VERSION >= 90000

Lines 239-241 public: Link Here

(-)a/src/common/kax_analyzer.h (+4 lines)
239	virtual void debug_abort_process();	239	virtual void debug_abort_process();
240	};	240	};
241	using console_kax_analyzer_cptr = std::shared_ptr<console_kax_analyzer_c>;	241	using console_kax_analyzer_cptr = std::shared_ptr<console_kax_analyzer_c>;
		242
		243	#if FMT_VERSION >= 90000
		244	template <> struct fmt::formatter<mtx::kax_analyzer_x> : ostream_formatter {};
		245	#endif // FMT_VERSION >= 90000

Lines 18-23 Link Here

(-)a/src/common/math_fwd.h (+5 lines)
18	using mtx_mp_rational_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_rational, boost::multiprecision::et_off>;	18	using mtx_mp_rational_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_rational, boost::multiprecision::et_off>;
19	using mtx_mp_int_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_int, boost::multiprecision::et_off>;	19	using mtx_mp_int_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_int, boost::multiprecision::et_off>;
20		20
		21	#if FMT_VERSION >= 90000
		22	template <> struct fmt::formatter<mtx_mp_rational_t> : ostream_formatter {};
		23	template <> struct fmt::formatter<mtx_mp_int_t> : ostream_formatter {};
		24	#endif // FMT_VERSION >= 90000
		25
21	namespace mtx {	26	namespace mtx {
22		27
23	// This conversion function exists to work around incomplete	28	// This conversion function exists to work around incomplete




}

}}

#if FMT_VERSION >= 90000
template <> struct fmt::formatter<mtx::mm_io::exception>                : ostream_formatter {};
template <> struct fmt::formatter<mtx::mm_io::end_of_file_x>            : ostream_formatter {};
template <> struct fmt::formatter<mtx::mm_io::seek_x>                   : ostream_formatter {};
template <> struct fmt::formatter<mtx::mm_io::read_write_x>             : ostream_formatter {};
template <> struct fmt::formatter<mtx::mm_io::open_x>                   : ostream_formatter {};
template <> struct fmt::formatter<mtx::mm_io::wrong_read_write_access_x>: ostream_formatter {};
template <> struct fmt::formatter<mtx::mm_io::insufficient_space_x>     : ostream_formatter {};
template <> struct fmt::formatter<mtx::mm_io::create_directory_x>       : ostream_formatter {};
template <> struct fmt::formatter<mtx::mm_io::text::exception>          : ostream_formatter {};
template <> struct fmt::formatter<mtx::mm_io::text::invalid_utf8_char_x>: ostream_formatter {};
#endif  // FMT_VERSION >= 90000

Lines 91-93 operator <<(std::ostream &out, Link Here

(-)a/src/common/opus.h (+6 lines)
91	}	91	}
92		92
93	}	93	}
		94
		95	#if FMT_VERSION >= 90000
		96	template <> struct fmt::formatter<mtx::opus::decode_error> : ostream_formatter {};
		97	template <> struct fmt::formatter<mtx::opus::id_header_t> : ostream_formatter {};
		98	template <> struct fmt::formatter<mtx::opus::toc_t> : ostream_formatter {};
		99	#endif // FMT_VERSION >= 90000

Lines 36-38 std::filesystem::path absolute(std::filesystem::path const &p); Link Here

(-)a/src/common/path.h (+4 lines)
36	void create_directories(std::filesystem::path const &path, std::error_code &error_code);	36	void create_directories(std::filesystem::path const &path, std::error_code &error_code);
37		37
38	} // namespace mtx::fs	38	} // namespace mtx::fs
		39
		40	#if FMT_VERSION >= 90000
		41	template <> struct fmt::formatter<std::filesystem::path> : ostream_formatter {};
		42	#endif // FMT_VERSION >= 90000

Lines 102-104 operator <<(std::wostream &out, Link Here

(-)a/src/common/qt.h (+4 lines)
102	out << string.toStdWString();	102	out << string.toStdWString();
103	return out;	103	return out;
104	}	104	}
		105
		106	#if FMT_VERSION >= 90000
		107	template <> struct fmt::formatter<QString> : ostream_formatter {};
		108	#endif // FMT_VERSION >= 90000

Lines 129-131 operator <<(std::ostream &out, Link Here

(-)a/src/common/strings/formatting.h (+4 lines)
129	out << mtx::string::format_timestamp(timestamp);	129	out << mtx::string::format_timestamp(timestamp);
130	return out;	130	return out;
131	}	131	}
		132
		133	#if FMT_VERSION >= 90000
		134	template <> struct fmt::formatter<basic_timestamp_c<int64_t>> : ostream_formatter {};
		135	#endif // FMT_VERSION >= 90000

Lines 80-83 operator <<(std::ostream &out, Link Here

(-)a/src/common/translation.h (+4 lines)
80	return out;	80	return out;
81	}	81	}
82		82
		83	#if FMT_VERSION >= 90000
		84	template <> struct fmt::formatter<translatable_string_c> : ostream_formatter {};
		85	#endif
		86
83	void init_locales(std::string locale = "");	87	void init_locales(std::string locale = "");

Lines 240-246 flac_reader_c::handle_picture_metadata(FLAC__StreamMetadata const *metadata) { Link Here

(-)a/src/input/r_flac.cpp (-2 / +2 lines)
240	mxdebug_if(m_debug, fmt::format("flac_reader: MIME type: {0}\n", attachment->mime_type));	240	mxdebug_if(m_debug, fmt::format("flac_reader: MIME type: {0}\n", attachment->mime_type));
241	mxdebug_if(m_debug, fmt::format("flac_reader: data length: {0}\n", picture.data_length));	241	mxdebug_if(m_debug, fmt::format("flac_reader: data length: {0}\n", picture.data_length));
242	mxdebug_if(m_debug, fmt::format("flac_reader: ID: {0}\n", m_attachment_id));	242	mxdebug_if(m_debug, fmt::format("flac_reader: ID: {0}\n", m_attachment_id));
243	mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", attach_mode));	243	mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", static_cast<unsigned int>(attach_mode)));
244		244
245	if (attachment->mime_type.empty() \|\| attachment->name.empty())	245	if (attachment->mime_type.empty() \|\| attachment->name.empty())
246	return;	246	return;
Lines 276-282 flac_reader_c::flac_metadata_cb(const FLAC__StreamMetadata *metadata) { Link Here
276	: metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT"	276	: metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT"
277	: metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET"	277	: metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET"
278	: "UNDEFINED",	278	: "UNDEFINED",
279	metadata->type, metadata->length));	279	static_cast<unsigned int>(metadata->type), metadata->length));
280	break;	280	break;
281	}	281	}
282	}	282	}

Lines 173-175 protected: Link Here

(-)a/src/input/r_flv.h (+5 lines)
173		173
174	unsigned int add_track(char type);	174	unsigned int add_track(char type);
175	};	175	};
		176
		177	#if FMT_VERSION >= 90000
		178	template <> struct fmt::formatter<flv_header_t> : ostream_formatter {};
		179	template <> struct fmt::formatter<flv_tag_c> : ostream_formatter {};
		180	#endif // FMT_VERSION >= 90000

Lines 244-246 private: Link Here

(-)a/src/input/r_mpeg_ps.h (+5 lines)
244	void sort_tracks();	244	void sort_tracks();
245	void calculate_global_timestamp_offset();	245	void calculate_global_timestamp_offset();
246	};	246	};
		247
		248	#if FMT_VERSION >= 90000
		249	template <> struct fmt::formatter<mpeg_ps_id_t> : ostream_formatter {};
		250	template <> struct fmt::formatter<mpeg_ps_packet_c> : ostream_formatter {};
		251	#endif // FMT_VERSION >= 90000

Lines 104-110 fhe_metadata_cb(const FLAC__StreamDecoder *, Link Here

(-)a/src/input/r_ogm_flac.cpp (-1 / +1 lines)
104	: metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT"	104	: metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT"
105	: metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET"	105	: metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET"
106	: "UNDEFINED",	106	: "UNDEFINED",
107	metadata->type, metadata->length));	107	static_cast<unsigned int>(metadata->type), metadata->length));
108	break;	108	break;
109	}	109	}
110	}	110	}

Lines 590-592 protected: Link Here

(-)a/src/input/r_qtmp4.h (+4 lines)
590		590
591	virtual void process_atom(qt_atom_t const &parent, int level, std::function<void(qt_atom_t const &)> const &handler);	591	virtual void process_atom(qt_atom_t const &parent, int level, std::function<void(qt_atom_t const &)> const &handler);
592	};	592	};
		593
		594	#if FMT_VERSION >= 90000
		595	template <> struct fmt::formatter<qt_atom_t> : ostream_formatter {};
		596	#endif // FMT_VERSION >= 90000

Lines 139-141 operator <<(std::ostream &out, Link Here

(-)a/src/merge/item_selector.h (+4 lines)
139		139
140	return out;	140	return out;
141	}	141	}
		142
		143	#if FMT_VERSION >= 90000
		144	template <typename T> struct fmt::formatter<item_selector_c<T>> : ostream_formatter {};
		145	#endif // FMT_VERSION >= 90000




                     "    selector_num_arg: {6}\n"
                     "    selector_string_arg: {7}\n",
                     m_file_name,
                     static_cast<unsigned int>(m_command),
                       ac_add     == m_command ? "add"
                     : ac_delete  == m_command ? "delete"
                     : ac_replace == m_command ? "replace"
                     : ac_update  == m_command ? "update"
                     :                           "unknown",
                     m_options,
                     static_cast<unsigned int>(m_selector_type),
                       st_id        == m_selector_type ? "ID"
                     : st_uid       == m_selector_type ? "UID"
                     : st_name      == m_selector_type ? "name"

Lines 130-132 operator <<(std::ostream &out, Link Here

(-)a/src/propedit/attachment_target.h (+4 lines)
130		130
131	return out;	131	return out;
132	}	132	}
		133
		134	#if FMT_VERSION >= 90000
		135	template <> struct fmt::formatter<attachment_target_c::options_t> : ostream_formatter {};
		136	#endif // FMT_VERSION >= 90000

Lines 104-113 tag_target_c::dump_info() Link Here

(-)a/src/propedit/tag_target.cpp (-3 / +3 lines)
104	" selection_track_type: {3}\n"	104	" selection_track_type: {3}\n"
105	" track_uid: {4}\n"	105	" track_uid: {4}\n"
106	" file_name: {5}\n",	106	" file_name: {5}\n",
107	static_cast<int>(m_operation_mode),	107	static_cast<unsigned int>(m_operation_mode),
108	static_cast<int>(m_selection_mode),	108	static_cast<unsigned int>(m_selection_mode),
109	m_selection_param,	109	m_selection_param,
110	m_selection_track_type,	110	static_cast<unsigned int>(m_selection_track_type),
111	m_track_uid,	111	m_track_uid,
112	m_file_name));	112	m_file_name));
113		113

Lines 78-86 track_target_c::dump_info() Link Here

(-)a/src/propedit/track_target.cpp (-3 / +2 lines)
78	" selection_track_type: {2}\n"	78	" selection_track_type: {2}\n"
79	" track_uid: {3}\n"	79	" track_uid: {3}\n"
80	" file_name: {4}\n",	80	" file_name: {4}\n",
81	static_cast<int>(m_selection_mode),	81	static_cast<unsigned int>(m_selection_mode),
82	m_selection_param,	82	m_selection_param,
83	m_selection_track_type,	83	static_cast<unsigned int>(m_selection_track_type),
84	m_track_uid,	84	m_track_uid,
85	m_file_name));	85	m_file_name));
86		86
87	-

Return to bug 856700

Lines 155-157 operator <<(std::ostream &out, Link Here

(-)a/src/common/mm_io_x.h (+13 lines)
155	}	155	}
156		156
157	}}	157	}}
		158
		159	#if FMT_VERSION >= 90000
		160	template <> struct fmt::formatter<mtx::mm_io::exception> : ostream_formatter {};
		161	template <> struct fmt::formatter<mtx::mm_io::end_of_file_x> : ostream_formatter {};
		162	template <> struct fmt::formatter<mtx::mm_io::seek_x> : ostream_formatter {};
		163	template <> struct fmt::formatter<mtx::mm_io::read_write_x> : ostream_formatter {};
		164	template <> struct fmt::formatter<mtx::mm_io::open_x> : ostream_formatter {};
		165	template <> struct fmt::formatter<mtx::mm_io::wrong_read_write_access_x>: ostream_formatter {};
		166	template <> struct fmt::formatter<mtx::mm_io::insufficient_space_x> : ostream_formatter {};
		167	template <> struct fmt::formatter<mtx::mm_io::create_directory_x> : ostream_formatter {};
		168	template <> struct fmt::formatter<mtx::mm_io::text::exception> : ostream_formatter {};
		169	template <> struct fmt::formatter<mtx::mm_io::text::invalid_utf8_char_x>: ostream_formatter {};
		170	#endif // FMT_VERSION >= 90000

Lines 83-96 attachment_target_c::dump_info() Link Here

(-)a/src/propedit/attachment_target.cpp (-2 / +2 lines)
83	" selector_num_arg: {6}\n"	83	" selector_num_arg: {6}\n"
84	" selector_string_arg: {7}\n",	84	" selector_string_arg: {7}\n",
85	m_file_name,	85	m_file_name,
86	m_command,	86	static_cast<unsigned int>(m_command),
87	ac_add == m_command ? "add"	87	ac_add == m_command ? "add"
88	: ac_delete == m_command ? "delete"	88	: ac_delete == m_command ? "delete"
89	: ac_replace == m_command ? "replace"	89	: ac_replace == m_command ? "replace"
90	: ac_update == m_command ? "update"	90	: ac_update == m_command ? "update"
91	: "unknown",	91	: "unknown",
92	m_options,	92	m_options,
93	m_selector_type,	93	static_cast<unsigned int>(m_selector_type),
94	st_id == m_selector_type ? "ID"	94	st_id == m_selector_type ? "ID"
95	: st_uid == m_selector_type ? "UID"	95	: st_uid == m_selector_type ? "UID"
96	: st_name == m_selector_type ? "name"	96	: st_name == m_selector_type ? "name"