projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Film::last_written_by_earlier_than()
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_batch.cc
diff --git
a/src/tools/dcpomatic_batch.cc
b/src/tools/dcpomatic_batch.cc
index 06147060267d60e7ac17281ce4985a0c73b928e5..79f1b39fa0f7080efda7cef3c9759bb5f37410dd 100644
(file)
--- a/
src/tools/dcpomatic_batch.cc
+++ b/
src/tools/dcpomatic_batch.cc
@@
-32,15
+32,19
@@
#include "lib/film.h"
#include "lib/job.h"
#include "lib/job_manager.h"
#include "lib/film.h"
#include "lib/job.h"
#include "lib/job_manager.h"
+#include "lib/make_dcp.h"
#include "lib/transcode_job.h"
#include "lib/util.h"
#include "lib/version.h"
#include "lib/transcode_job.h"
#include "lib/util.h"
#include "lib/version.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/aboutdlg.h>
#include <wx/cmdline.h>
#include <wx/preferences.h>
#include <wx/splash.h>
#include <wx/stdpaths.h>
#include <wx/wx.h>
#include <wx/aboutdlg.h>
#include <wx/cmdline.h>
#include <wx/preferences.h>
#include <wx/splash.h>
#include <wx/stdpaths.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <iostream>
#include <set>
#include <iostream>
#include <set>
@@
-211,7
+215,7
@@
public:
}
}
}
}
-
film->make_dcp (
);
+
make_dcp (film, TranscodeJob::ChangedBehaviour::STOP
);
} catch (std::exception& e) {
auto p = std_to_wx (path.string ());
auto b = p.ToUTF8 ();
} catch (std::exception& e) {
auto p = std_to_wx (path.string ());
auto b = p.ToUTF8 ();
@@
-369,7
+373,7
@@
public:
, _frame (frame)
{}
, _frame (frame)
{}
- void handle (shared_ptr<Socket> socket)
+ void handle (shared_ptr<Socket> socket)
override
{
try {
int const length = socket->read_uint32 ();
{
try {
int const length = socket->read_uint32 ();
@@
-390,7
+394,7
@@
private:
class App : public wxApp
{
class App : public wxApp
{
- bool OnInit ()
+ bool OnInit ()
override
{
wxInitAllImageHandlers ();
{
wxInitAllImageHandlers ();
@@
-450,7
+454,7
@@
class App : public wxApp
try {
film = make_shared<Film>(i);
film->read_metadata ();
try {
film = make_shared<Film>(i);
film->read_metadata ();
-
film->make_dcp (
);
+
make_dcp (film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP
);
} catch (exception& e) {
error_dialog (
0,
} catch (exception& e) {
error_dialog (
0,
@@
-469,13
+473,13
@@
class App : public wxApp
signal_manager->ui_idle ();
}
signal_manager->ui_idle ();
}
- void OnInitCmdLine (wxCmdLineParser& parser)
+ void OnInitCmdLine (wxCmdLineParser& parser)
override
{
parser.SetDesc (command_line_description);
parser.SetSwitchChars (wxT ("-"));
}
{
parser.SetDesc (command_line_description);
parser.SetSwitchChars (wxT ("-"));
}
- bool OnCmdLineParsed (wxCmdLineParser& parser)
+ bool OnCmdLineParsed (wxCmdLineParser& parser)
override
{
for (size_t i = 0; i < parser.GetParamCount(); ++i) {
films_to_load.push_back (wx_to_std(parser.GetParam(i)));
{
for (size_t i = 0; i < parser.GetParamCount(); ++i) {
films_to_load.push_back (wx_to_std(parser.GetParam(i)));