#include <string>
#include <vector>
-#include "util.h"
+#include <libdcp/util.h>
class Film;
class Format
{
public:
- Format (libdcp::Size dcp, std::string id, std::string n, std::string d, std::string e)
+ Format (libdcp::Size dcp, std::string id, std::string n)
: _dcp_size (dcp)
, _id (id)
, _nickname (n)
- , _dci_name (d)
- , _description (e)
{}
- /** @return the aspect ratio multiplied by 100
- * (e.g. 239 for Cinemascope 2.39:1)
- */
- 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 (boost::shared_ptr<const Film> f) const = 0;
-
- /** @return the ratio of the container (including any padding) as a floating point number */
- float container_ratio_as_float () 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
- * to the ratio when we are doing things like 16:9 in a Flat frame.
+ * put in a DCP for this format.
*/
libdcp::Size dcp_size () const {
return _dcp_size;
}
/** @return Full name to present to the user */
- virtual std::string name () const = 0;
+ std::string name () const;
/** @return Nickname (e.g. Flat, Scope) */
std::string nickname () const {
return _nickname;
}
- std::string dci_name () const {
- return _dci_name;
- }
-
- std::string description () const {
- return _description;
- }
-
- std::string as_metadata () const;
-
static Format const * from_nickname (std::string n);
- static Format const * from_metadata (std::string m);
static Format const * from_id (std::string i);
static std::vector<Format const *> all ();
static void setup_formats ();
protected:
+ /** @return the ratio */
+ float ratio () const;
+
/** libdcp::Size in pixels of the images that we should
- * put in a DCP for this ratio. This size will not correspond
- * to the ratio when we are doing things like 16:9 in a Flat frame.
+ * put in a DCP for this format.
*/
libdcp::Size _dcp_size;
/** id for use in metadata */
std::string _id;
/** nickname (e.g. Flat, Scope) */
std::string _nickname;
- std::string _dci_name;
- std::string _description;
private:
/** all available formats */
static std::vector<Format const *> _formats;
};
-
-/** @class FixedFormat
- * @brief Class to describe a format whose ratio is fixed regardless
- * of source size.
- */
-class FixedFormat : public Format
-{
-public:
- FixedFormat (int, libdcp::Size, std::string, std::string, std::string, std::string);
-
- int ratio_as_integer (boost::shared_ptr<const Film>) const {
- return _ratio;
- }
-
- float ratio_as_float (boost::shared_ptr<const Film>) const {
- return _ratio / 100.0;
- }
-
- std::string name () const;
-
-private:
-
- /** Ratio expressed as the actual ratio multiplied by 100 */
- int _ratio;
-};
-
-class VariableFormat : public Format
-{
-public:
- VariableFormat (libdcp::Size, std::string, std::string, std::string, std::string);
-
- 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;
-};