Various work on certificate handling for screens; need XML config here, now.

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

diff --git a/src/lib/format.h b/src/lib/format.h
index fd6cdbece31b1ffb51db910fa77493a98228aa38..2118237a406525e99295765270d4133e3cf98e87 100644 (file)
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -31,21 +31,22 @@ class Film;
 class Format
 {
 public:
-       Format (Size dcp, std::string id, std::string n)
+       Format (Size dcp, std::string id, std::string n, std::string d)
                : _dcp_size (dcp)
                , _id (id)
                , _nickname (n)
+               , _dci_name (d)
        {}
 
        /** @return the aspect ratio multiplied by 100
         *  (e.g. 239 for Cinemascope 2.39:1)
         */
-       virtual int ratio_as_integer (Film const * f) const = 0;
+       virtual int ratio_as_integer (boost::shared_ptr<const Film> f) const = 0;
 
        /** @return the ratio as a floating point number */
-       virtual float ratio_as_float (Film const * f) const = 0;
+       virtual float ratio_as_float (boost::shared_ptr<const Film> f) const = 0;
 
-       int dcp_padding (Film const * f) const;
+       int dcp_padding (boost::shared_ptr<const Film> f) const;
 
        /** @return size in pixels of the images that we should
         *  put in a DCP for this ratio.  This size will not correspond
@@ -67,6 +68,10 @@ public:
                return _nickname;
        }
 
+       std::string dci_name () const {
+               return _dci_name;
+       }
+
        std::string as_metadata () const;
 
        static Format const * from_nickname (std::string n);
@@ -85,6 +90,7 @@ protected:
        std::string _id;
        /** nickname (e.g. Flat, Scope) */
        std::string _nickname;
+       std::string _dci_name;
 
 private:       
        /** all available formats */
@@ -98,13 +104,13 @@ private:
 class FixedFormat : public Format
 {
 public:
-       FixedFormat (int, Size, std::string, std::string);
+       FixedFormat (int, Size, std::string, std::string, std::string);
 
-       int ratio_as_integer (Film const *) const {
+       int ratio_as_integer (boost::shared_ptr<const Film>) const {
                return _ratio;
        }
 
-       float ratio_as_float (Film const *) const {
+       float ratio_as_float (boost::shared_ptr<const Film>) const {
                return _ratio / 100.0;
        }
 
@@ -119,10 +125,10 @@ private:
 class VariableFormat : public Format
 {
 public:
-       VariableFormat (Size, std::string, std::string);
+       VariableFormat (Size, std::string, std::string, std::string);
 
-       int ratio_as_integer (Film const * f) const;
-       float ratio_as_float (Film const * f) const;
+       int ratio_as_integer (boost::shared_ptr<const Film> f) const;
+       float ratio_as_float (boost::shared_ptr<const Film> f) const;
 
        std::string name () const;
 };