projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give an error if a non-DCP folder is selected for DCP writing (#2024).
[dcpomatic.git]
/
src
/
lib
/
combine_dcp_job.h
diff --git
a/src/lib/combine_dcp_job.h
b/src/lib/combine_dcp_job.h
index 97bf201101d70fb94e3de763fe93b00d5522e374..4a7e02b8b4e2d055c3947748d52c8ddc5a12b8a1 100644
(file)
--- a/
src/lib/combine_dcp_job.h
+++ b/
src/lib/combine_dcp_job.h
@@
-26,7
+26,7
@@
class CombineDCPJob : public Job
{
public:
class CombineDCPJob : public Job
{
public:
- CombineDCPJob (std::vector<boost::filesystem::path> inputs, boost::filesystem::path output);
+ CombineDCPJob (std::vector<boost::filesystem::path> inputs, boost::filesystem::path output
, std::string annotation_text
);
std::string name () const;
std::string json_name () const;
std::string name () const;
std::string json_name () const;
@@
-35,5
+35,6
@@
public:
private:
std::vector<boost::filesystem::path> _inputs;
boost::filesystem::path _output;
private:
std::vector<boost::filesystem::path> _inputs;
boost::filesystem::path _output;
+ std::string _annotation_text;
};
};