summaryrefslogtreecommitdiff
path: root/src/lib/util.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-01-09 16:29:21 +0100
committerCarl Hetherington <cth@carlh.net>2022-01-09 16:29:21 +0100
commit92b7d1cffbd0d457f8b4b23cc72937bcf8e5ed5e (patch)
treeb175db682422765468991702e8563bcd89713b70 /src/lib/util.h
parent7392cb8383c9b857edad5f99eaf917ed70da237d (diff)
Tidying.
Diffstat (limited to 'src/lib/util.h')
-rw-r--r--src/lib/util.h31
1 files changed, 4 insertions, 27 deletions
diff --git a/src/lib/util.h b/src/lib/util.h
index 1296dc789..0f3351dbf 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -34,13 +34,13 @@
#include "types.h"
#include <dcp/atmos_asset.h>
#include <dcp/decrypted_kdm.h>
-#include <dcp/util.h>
#include <dcp/subtitle_image.h>
-#include <boost/optional.hpp>
-#include <boost/filesystem.hpp>
+#include <dcp/util.h>
#include <boost/date_time/gregorian/gregorian.hpp>
-#include <string>
+#include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
#include <map>
+#include <string>
#include <vector>
#undef check
@@ -130,29 +130,6 @@ extern dcp::DecryptedKDM decrypt_kdm_with_helpful_error (dcp::EncryptedKDM kdm);
extern boost::filesystem::path default_font_file ();
extern std::string to_upper (std::string s);
extern void start_of_thread (std::string name);
-
-template <class T>
-std::list<T>
-vector_to_list (std::vector<T> v)
-{
- std::list<T> l;
- for (auto& i: v) {
- l.push_back (i);
- }
- return l;
-}
-
-template <class T>
-std::vector<T>
-list_to_vector (std::list<T> v)
-{
- std::vector<T> l;
- for (auto& i: v) {
- l.push_back (i);
- }
- return l;
-}
-
extern double db_to_linear (double db);
extern double linear_to_db (double linear);