summaryrefslogtreecommitdiff
path: root/src/lib/util.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-09-11 00:10:22 +0200
committerCarl Hetherington <cth@carlh.net>2023-12-16 02:07:37 +0100
commit5bfdb7e6c422dfc2f8c9124d4249633933a0b063 (patch)
treebf712c49cb2fc6dda8b93e50da28d8935f4b7ebf /src/lib/util.h
parentd828617ab8613d432c1796991e8e23118e32df34 (diff)
Normalise XML attribute names to be camelCase (#2241).
Diffstat (limited to 'src/lib/util.h')
-rw-r--r--src/lib/util.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/lib/util.h b/src/lib/util.h
index b92869b25..2d65b9214 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -32,6 +32,7 @@
#include "dcpomatic_time.h"
#include "pixel_quanta.h"
#include "types.h"
+#include <libcxml/cxml.h>
#include <dcp/atmos_asset.h>
#include <dcp/decrypted_kdm.h>
#include <dcp/util.h>
@@ -98,4 +99,16 @@ extern bool contains_assetmap(boost::filesystem::path dir);
extern std::string word_wrap(std::string input, int columns);
extern void capture_ffmpeg_logs();
+
+template <class T>
+T
+number_attribute(cxml::ConstNodePtr node, std::string name1, std::string name2)
+{
+ auto value = node->optional_number_attribute<T>(name1);
+ if (!value) {
+ value = node->number_attribute<T>(name2);
+ }
+ return *value;
+}
+
#endif