X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fratio.h;h=9e9d58a4043355455a9c0b4281732611ce4d6039;hb=e669b562937786bf5b771c927cc03a4074b01be8;hp=6916a74912cdaa5c9c322312e867747b40d9f700;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git

diff --git a/src/lib/ratio.h b/src/lib/ratio.h
index 6916a7491..9e9d58a40 100644
--- a/src/lib/ratio.h
+++ b/src/lib/ratio.h
@@ -1,37 +1,40 @@
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+#ifndef DCPOMATIC_RATIO_H
+#define DCPOMATIC_RATIO_H
+
+#include <dcp/util.h>
+#include <boost/utility.hpp>
 #include <vector>
-#include <libdcp/util.h>
 
-class Ratio
+class Ratio : public boost::noncopyable
 {
 public:
 	Ratio (float ratio, std::string id, std::string n, std::string d)
 		: _ratio (ratio)
 		, _id (id)
 		, _nickname (n)
-		, _dci_name (d)
+		, _isdcf_name (d)
 	{}
 
-	libdcp::Size size (libdcp::Size) const;
-
 	std::string id () const {
 		return _id;
 	}
@@ -40,8 +43,8 @@ public:
 		return _nickname;
 	}
 
-	std::string dci_name () const {
-		return _dci_name;
+	std::string isdcf_name () const {
+		return _isdcf_name;
 	}
 
 	float ratio () const {
@@ -50,6 +53,8 @@ public:
 
 	static void setup_ratios ();
 	static Ratio const * from_id (std::string i);
+	static Ratio const * from_ratio (float r);
+	static Ratio const * nearest_from_ratio (float r);
 	static std::vector<Ratio const *> all () {
 		return _ratios;
 	}
@@ -60,7 +65,9 @@ private:
 	std::string _id;
 	/** nickname (e.g. Flat, Scope) */
 	std::string _nickname;
-	std::string _dci_name;
+	std::string _isdcf_name;
 
-	static std::vector<Ratio const *> _ratios;	
+	static std::vector<Ratio const *> _ratios;
 };
+
+#endif