projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply 80562fe5dce5fd625da583ca6f7c2833f9db8754 from master (remove default scale...
[dcpomatic.git]
/
src
/
lib
/
ratio.h
diff --git
a/src/lib/ratio.h
b/src/lib/ratio.h
index 6916a74912cdaa5c9c322312e867747b40d9f700..f1a180d8f9d5ae2c8197ce25a17e59fe0fc18b2b 100644
(file)
--- a/
src/lib/ratio.h
+++ b/
src/lib/ratio.h
@@
-17,21
+17,23
@@
*/
*/
+#ifndef DCPOMATIC_RATIO_H
+#define DCPOMATIC_RATIO_H
+
#include <vector>
#include <vector>
-#include <libdcp/util.h>
+#include <boost/utility.hpp>
+#include <dcp/util.h>
-class Ratio
+class Ratio
: public boost::noncopyable
{
public:
Ratio (float ratio, std::string id, std::string n, std::string d)
: _ratio (ratio)
, _id (id)
, _nickname (n)
{
public:
Ratio (float ratio, std::string id, std::string n, std::string d)
: _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;
}
@@
-40,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 {
@@
-50,6
+52,8
@@
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 Ratio const * nearest_from_ratio (float r);
static std::vector<Ratio const *> all () {
return _ratios;
}
static std::vector<Ratio const *> all () {
return _ratios;
}
@@
-60,7
+64,9
@@
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;
};
+
+#endif