projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move burnt subtitle checks into ::subtitle_languages().
[dcpomatic.git]
/
src
/
lib
/
filter.h
diff --git
a/src/lib/filter.h
b/src/lib/filter.h
index f73a954538350d18a287582eddc643996baa96d5..bcc40dad7c88fa162b63a893f9a804de4e50e1d1 100644
(file)
--- a/
src/lib/filter.h
+++ b/
src/lib/filter.h
@@
-28,6
+28,7
@@
#define DCPOMATIC_FILTER_H
#define DCPOMATIC_FILTER_H
+#include <boost/optional.hpp>
#include <string>
#include <vector>
#include <string>
#include <vector>
@@
-42,7
+43,7
@@
class Filter
{
public:
class Filter
{
public:
- Filter
(std::string i, std::string n, std::string c, std::string f
);
+ Filter
(std::string id, std::string name, std::string category, std::string ffmpeg_string
);
/** @return our id */
std::string id () const {
/** @return our id */
std::string id () const {
@@
-63,10
+64,10
@@
public:
return _category;
}
return _category;
}
- static std::vector<Filter
const *
> all ();
- static
Filter const * from_id
(std::string d);
+ static std::vector<Filter> all ();
+ static
boost::optional<Filter> from_id
(std::string d);
static void setup_filters ();
static void setup_filters ();
- static std::string ffmpeg_string
(std::vector<Filter const *> const
& filters);
+ static std::string ffmpeg_string
(std::vector<Filter> const
& filters);
private:
private:
@@
-80,8
+81,12
@@
private:
/** all available filters */
static std::vector<Filter> _filters;
/** all available filters */
static std::vector<Filter> _filters;
- static void maybe_add (std::string, std::string, std::string, std::string);
};
};
+bool operator==(Filter const& a, Filter const& b);
+bool operator!=(Filter const& a, Filter const& b);
+bool operator<(Filter const& a, Filter const& b);
+
+
#endif
#endif