X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_batch.cc;h=e3beb8dc6deb1760199488c65b60b68abe63c6ef;hb=2e134de1d71debb8465a43703b14a19ffeb4211e;hp=6d4490ad7bb36a9fc616e3494eb8f2c29d188287;hpb=ab1c8a67afba072b1c29f0c3c34aa9779643e66a;p=dcpomatic.git diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 6d4490ad7..e3beb8dc6 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -24,13 +24,16 @@ #include "wx/job_manager_view.h" #include "wx/full_config_dialog.h" #include "wx/servers_list_dialog.h" +#include "wx/dcpomatic_button.h" #include "lib/version.h" #include "lib/compose.hpp" #include "lib/config.h" #include "lib/util.h" #include "lib/film.h" #include "lib/job_manager.h" +#include "lib/job.h" #include "lib/dcpomatic_socket.h" +#include "lib/transcode_job.h" #include #include #include @@ -39,14 +42,17 @@ #include #include #include +#include using std::exception; using std::string; using std::cout; using std::list; +using std::set; using boost::shared_ptr; using boost::thread; using boost::scoped_array; +using boost::dynamic_pointer_cast; static list films_to_load; @@ -118,9 +124,17 @@ public: _sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6); wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL); - wxButton* add = new wxButton (panel, wxID_ANY, _("Add Film...")); + wxButton* add = new Button (panel, _("Add Film...")); add->Bind (wxEVT_BUTTON, boost::bind (&DOMFrame::add_film, this)); buttons->Add (add, 1, wxALL, 6); + _pause = new Button (panel, _("Pause")); + _pause->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::pause, this)); + buttons->Add (_pause, 1, wxALL, 6); + _resume = new Button (panel, _("Resume")); + _resume->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::resume, this)); + buttons->Add (_resume, 1, wxALL, 6); + + setup_sensitivity (); _sizer->Add (buttons, 0, wxALL, 6); @@ -130,11 +144,66 @@ public: Bind (wxEVT_SIZE, boost::bind (&DOMFrame::sized, this, _1)); } + void setup_sensitivity () + { + _pause->Enable (!JobManager::instance()->paused()); + _resume->Enable (JobManager::instance()->paused()); + } + + void pause () + { + JobManager::instance()->pause (); + setup_sensitivity (); + } + + void resume () + { + JobManager::instance()->resume (); + setup_sensitivity (); + } + void start_job (boost::filesystem::path path) { try { shared_ptr film (new Film (path)); film->read_metadata (); + + double total_required; + double available; + bool can_hard_link; + + film->should_be_enough_disk_space (total_required, available, can_hard_link); + + set > films; + + BOOST_FOREACH (shared_ptr i, JobManager::instance()->get()) { + films.insert (i->film()); + } + + BOOST_FOREACH (shared_ptr i, films) { + double progress = 0; + BOOST_FOREACH (shared_ptr j, JobManager::instance()->get()) { + if (i == j->film() && dynamic_pointer_cast(j)) { + progress = j->progress().get_value_or(0); + } + } + + double required; + i->should_be_enough_disk_space (required, available, can_hard_link); + total_required += (1 - progress) * required; + } + + if ((total_required - available) > 1) { + if (!confirm_dialog ( + this, + wxString::Format( + _("The DCPs for this film and the films already in the queue will take up about %.1f GB. The " + "disks that you are using only have %.1f GB available. Do you want to add this film to the queue anyway?"), + total_required, available))) { + return; + } + } + film->make_dcp (); } catch (std::exception& e) { wxString p = std_to_wx (path.string ()); @@ -274,6 +343,8 @@ private: wxSizer* _sizer; wxPreferencesEditor* _config_dialog; ServersListDialog* _servers_list_dialog; + wxButton* _pause; + wxButton* _resume; }; static const wxCmdLineEntryDesc command_line_description[] = { @@ -311,6 +382,8 @@ class App : public wxApp { bool OnInit () { + wxInitAllImageHandlers (); + SetAppName (_("DCP-o-matic Batch Converter")); is_batch_converter = true;