projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Runs.
[dcpomatic.git]
/
src
/
lib
/
format.h
diff --git
a/src/lib/format.h
b/src/lib/format.h
index 305524628c50f848b4963292a5fb66addabaf8f6..94c2253dee88883ea12b418b66cd9edddf4f8185 100644
(file)
--- a/
src/lib/format.h
+++ b/
src/lib/format.h
@@
-26,7
+26,7
@@
#include <vector>
#include "util.h"
#include <vector>
#include "util.h"
-class
Film
;
+class
Playlist
;
class Format
{
class Format
{
@@
-42,15
+42,15
@@
public:
/** @return the aspect ratio multiplied by 100
* (e.g. 239 for Cinemascope 2.39:1)
*/
/** @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;
+ virtual int ratio_as_integer (boost::shared_ptr<const
Playlist
> f) const = 0;
/** @return the ratio as a floating point number */
/** @return the ratio as a floating point number */
- virtual float ratio_as_float (boost::shared_ptr<const
Film
> f) const = 0;
+ virtual float ratio_as_float (boost::shared_ptr<const
Playlist
> f) const = 0;
/** @return the ratio of the container (including any padding) as a floating point number */
float container_ratio_as_float () const;
/** @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;
+ int dcp_padding (boost::shared_ptr<const
Playlist>
) const;
/** @return size in pixels of the images that we should
* put in a DCP for this ratio. This size will not correspond
/** @return size in pixels of the images that we should
* put in a DCP for this ratio. This size will not correspond
@@
-115,11
+115,11
@@
class FixedFormat : public Format
public:
FixedFormat (int, libdcp::Size, std::string, std::string, std::string, std::string);
public:
FixedFormat (int, libdcp::Size, std::string, std::string, std::string, std::string);
- int ratio_as_integer (boost::shared_ptr<const
Film
>) const {
+ int ratio_as_integer (boost::shared_ptr<const
Playlist
>) const {
return _ratio;
}
return _ratio;
}
- float ratio_as_float (boost::shared_ptr<const
Film
>) const {
+ float ratio_as_float (boost::shared_ptr<const
Playlist
>) const {
return _ratio / 100.0;
}
return _ratio / 100.0;
}
@@
-136,8
+136,8
@@
class VariableFormat : public Format
public:
VariableFormat (libdcp::Size, std::string, std::string, std::string, std::string);
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;
+ int ratio_as_integer (boost::shared_ptr<const
Playlist
> f) const;
+ float ratio_as_float (boost::shared_ptr<const
Playlist
> f) const;
std::string name () const;
};
std::string name () const;
};