projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
ratio.h
diff --git
a/src/lib/ratio.h
b/src/lib/ratio.h
index c331edabe8104afd54e0ab0a8895aa7cebf5ef91..69e3726c83f201e91cf48e5b955e215c6eea8d2c 100644
(file)
--- a/
src/lib/ratio.h
+++ b/
src/lib/ratio.h
@@
-22,7
+22,7
@@
#include <vector>
#include <boost/utility.hpp>
#include <vector>
#include <boost/utility.hpp>
-#include <
lib
dcp/util.h>
+#include <dcp/util.h>
class Ratio : public boost::noncopyable
{
class Ratio : public boost::noncopyable
{
@@
-31,11
+31,9
@@
public:
: _ratio (ratio)
, _id (id)
, _nickname (n)
: _ratio (ratio)
, _id (id)
, _nickname (n)
- , _
dci
_name (d)
+ , _
isdcf
_name (d)
{}
{}
- libdcp::Size size (libdcp::Size) const;
-
std::string id () const {
return _id;
}
std::string id () const {
return _id;
}
@@
-44,8
+42,8
@@
public:
return _nickname;
}
return _nickname;
}
- std::string
dci
_name () const {
- return _
dci
_name;
+ std::string
isdcf
_name () const {
+ return _
isdcf
_name;
}
float ratio () const {
}
float ratio () const {
@@
-54,6
+52,7
@@
public:
static void setup_ratios ();
static Ratio const * from_id (std::string i);
static void setup_ratios ();
static Ratio const * from_id (std::string i);
+ static Ratio const * from_ratio (float r);
static std::vector<Ratio const *> all () {
return _ratios;
}
static std::vector<Ratio const *> all () {
return _ratios;
}
@@
-64,7
+63,7
@@
private:
std::string _id;
/** nickname (e.g. Flat, Scope) */
std::string _nickname;
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;
};