Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / ratio.h

diff --git a/src/lib/ratio.h b/src/lib/ratio.h
index cd7d0d6e4de276b138f92733b3bbcee99ad5d10a..9e9d58a4043355455a9c0b4281732611ce4d6039 100644 (file)
--- a/src/lib/ratio.h
+++ b/src/lib/ratio.h
@@ -1,28 +1,29 @@
 /*
     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 <vector>
-#include <boost/utility.hpp>
 #include <dcp/util.h>
+#include <boost/utility.hpp>
+#include <vector>
 
 class Ratio : public boost::noncopyable
 {
@@ -31,7 +32,7 @@ public:
                : _ratio (ratio)
                , _id (id)
                , _nickname (n)
-               , _dci_name (d)
+               , _isdcf_name (d)
        {}
 
        std::string id () const {
@@ -42,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 {
@@ -52,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;
        }
@@ -62,9 +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