projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use atomic for _fast.
[dcpomatic.git]
/
src
/
lib
/
ratio.h
diff --git
a/src/lib/ratio.h
b/src/lib/ratio.h
index 42f29458ab883deead8b9ea4f826d3eefa6da5d1..31ff0935896c4f40a1e82a37e4852263d0055a13 100644
(file)
--- a/
src/lib/ratio.h
+++ b/
src/lib/ratio.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,14
+18,20
@@
*/
*/
+
#ifndef DCPOMATIC_RATIO_H
#define DCPOMATIC_RATIO_H
#ifndef DCPOMATIC_RATIO_H
#define DCPOMATIC_RATIO_H
+
#include <dcp/util.h>
#include <boost/utility.hpp>
#include <vector>
#include <dcp/util.h>
#include <boost/utility.hpp>
#include <vector>
-class Ratio : public boost::noncopyable
+
+/** @class Ratio
+ * @brief Description of an image ratio.
+ */
+class Ratio
{
public:
Ratio (float ratio, std::string id, std::string in, boost::optional<std::string> cn, std::string d)
{
public:
Ratio (float ratio, std::string id, std::string in, boost::optional<std::string> cn, std::string d)
@@
-46,6
+52,10
@@
public:
std::string container_nickname () const;
std::string container_nickname () const;
+ bool used_for_container () const {
+ return static_cast<bool>(_container_nickname);
+ }
+
std::string isdcf_name () const {
return _isdcf_name;
}
std::string isdcf_name () const {
return _isdcf_name;
}
@@
-59,9
+69,7
@@
public:
static Ratio const * from_ratio (float r);
static Ratio const * nearest_from_ratio (float r);
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 ();
static std::vector<Ratio const *> containers ();
static std::vector<Ratio const *> containers ();
@@
-75,7
+83,8
@@
private:
boost::optional<std::string> _container_nickname;
std::string _isdcf_name;
boost::optional<std::string> _container_nickname;
std::string _isdcf_name;
- static std::vector<Ratio
const *
> _ratios;
+ static std::vector<Ratio> _ratios;
};
};
+
#endif
#endif