X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fratio.h;h=31ff0935896c4f40a1e82a37e4852263d0055a13;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=40f596ab8ea6dd1f3d0aa6a9c9bb6e7b69d4428d;hpb=e530b2e36d7646f7fd7bd0ca0ebcc0a40ddf52c1;p=dcpomatic.git

diff --git a/src/lib/ratio.h b/src/lib/ratio.h
index 40f596ab8..31ff09358 100644
--- a/src/lib/ratio.h
+++ b/src/lib/ratio.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,20 @@
 
 */
 
+
 #ifndef DCPOMATIC_RATIO_H
 #define DCPOMATIC_RATIO_H
 
+
 #include <dcp/util.h>
 #include <boost/utility.hpp>
 #include <vector>
 
+
 /** @class Ratio
  *  @brief Description of an image ratio.
  */
-class Ratio : public boost::noncopyable
+class Ratio
 {
 public:
 	Ratio (float ratio, std::string id, std::string in, boost::optional<std::string> cn, std::string d)
@@ -50,7 +53,7 @@ public:
 	std::string container_nickname () const;
 
 	bool used_for_container () const {
-		return static_cast<bool> (_container_nickname);
+		return static_cast<bool>(_container_nickname);
 	}
 
 	std::string isdcf_name () const {
@@ -66,9 +69,7 @@ public:
 	static Ratio const * from_ratio (float r);
 	static Ratio const * nearest_from_ratio (float r);
 
-	static std::vector<Ratio const *> all () {
-		return _ratios;
-	}
+	static std::vector<Ratio const *> all ();
 
 	static std::vector<Ratio const *> containers ();
 
@@ -82,7 +83,8 @@ private:
 	boost::optional<std::string> _container_nickname;
 	std::string _isdcf_name;
 
-	static std::vector<Ratio const *> _ratios;
+	static std::vector<Ratio> _ratios;
 };
 
+
 #endif