/*
- Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "wx/wx_util.h"
+
#include "wx/about_dialog.h"
-#include "wx/wx_signal_manager.h"
-#include "wx/job_manager_view.h"
+#include "wx/dcpomatic_button.h"
#include "wx/full_config_dialog.h"
+#include "wx/job_manager_view.h"
#include "wx/servers_list_dialog.h"
-#include "wx/dcpomatic_button.h"
-#include "lib/version.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
#include "lib/compose.hpp"
#include "lib/config.h"
-#include "lib/util.h"
+#include "lib/dcpomatic_socket.h"
#include "lib/film.h"
-#include "lib/job_manager.h"
#include "lib/job.h"
-#include "lib/dcpomatic_socket.h"
+#include "lib/job_manager.h"
#include "lib/transcode_job.h"
+#include "lib/util.h"
+#include "lib/version.h"
#include <wx/aboutdlg.h>
-#include <wx/stdpaths.h>
#include <wx/cmdline.h>
-#include <wx/splash.h>
#include <wx/preferences.h>
+#include <wx/splash.h>
+#include <wx/stdpaths.h>
#include <wx/wx.h>
-#include <boost/foreach.hpp>
#include <iostream>
+#include <set>
+
-using std::exception;
-using std::string;
using std::cout;
+using std::dynamic_pointer_cast;
+using std::exception;
using std::list;
+using std::make_shared;
using std::set;
-using boost::shared_ptr;
-using boost::thread;
+using std::shared_ptr;
+using std::string;
using boost::scoped_array;
-using boost::dynamic_pointer_cast;
+using boost::thread;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
static list<boost::filesystem::path> films_to_load;
+
enum {
ID_file_add_film = 1,
ID_tools_encoding_servers,
ID_help_about
};
+
void
setup_menu (wxMenuBar* m)
{
- wxMenu* file = new wxMenu;
+ auto file = new wxMenu;
file->Append (ID_file_add_film, _("&Add Film...\tCtrl-A"));
#ifdef DCPOMATIC_OSX
file->Append (wxID_EXIT, _("&Exit"));
#ifdef DCPOMATIC_OSX
file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
#else
- wxMenu* edit = new wxMenu;
+ auto edit = new wxMenu;
edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
#endif
- wxMenu* tools = new wxMenu;
+ auto tools = new wxMenu;
tools->Append (ID_tools_encoding_servers, _("Encoding servers..."));
- wxMenu* help = new wxMenu;
+ auto help = new wxMenu;
help->Append (ID_help_about, _("About"));
m->Append (file, _("&File"));
m->Append (help, _("&Help"));
}
+
class DOMFrame : public wxFrame
{
public:
explicit DOMFrame (wxString const & title)
- : wxFrame (NULL, -1, title)
- , _sizer (new wxBoxSizer (wxVERTICAL))
- , _config_dialog (0)
- , _servers_list_dialog (0)
+ : wxFrame (nullptr, -1, title)
+ , _sizer (new wxBoxSizer(wxVERTICAL))
{
- wxMenuBar* bar = new wxMenuBar;
+ auto bar = new wxMenuBar;
setup_menu (bar);
SetMenuBar (bar);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), ID_help_about);
- wxPanel* panel = new wxPanel (this);
- wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ auto panel = new wxPanel (this);
+ auto s = new wxBoxSizer (wxHORIZONTAL);
s->Add (panel, 1, wxEXPAND);
SetSizer (s);
- JobManagerView* job_manager_view = new JobManagerView (panel, true);
+ auto job_manager_view = new JobManagerView (panel, true);
_sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
- wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
- wxButton* add = new Button (panel, _("Add Film..."));
- add->Bind (wxEVT_BUTTON, boost::bind (&DOMFrame::add_film, this));
+ auto buttons = new wxBoxSizer (wxHORIZONTAL);
+ auto 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));
panel->SetSizer (_sizer);
- Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1));
- Bind (wxEVT_SIZE, boost::bind (&DOMFrame::sized, this, _1));
+ Bind (wxEVT_CLOSE_WINDOW, boost::bind(&DOMFrame::close, this, _1));
+ Bind (wxEVT_SIZE, boost::bind(&DOMFrame::sized, this, _1));
}
void setup_sensitivity ()
void pause ()
{
- JobManager::instance()->pause ();
+ JobManager::instance()->pause();
setup_sensitivity ();
}
void resume ()
{
- JobManager::instance()->resume ();
+ JobManager::instance()->resume();
setup_sensitivity ();
}
void start_job (boost::filesystem::path path)
{
try {
- shared_ptr<Film> film (new Film (path));
+ auto film = make_shared<Film>(path);
film->read_metadata ();
double total_required;
film->should_be_enough_disk_space (total_required, available, can_hard_link);
- set<shared_ptr<const Film> > films;
+ set<shared_ptr<const Film>> films;
- BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+ for (auto i: JobManager::instance()->get()) {
films.insert (i->film());
}
- BOOST_FOREACH (shared_ptr<const Film> i, films) {
+ for (auto i: films) {
double progress = 0;
- BOOST_FOREACH (shared_ptr<Job> j, JobManager::instance()->get()) {
+ for (auto j: JobManager::instance()->get()) {
if (i == j->film() && dynamic_pointer_cast<TranscodeJob>(j)) {
progress = j->progress().get_value_or(0);
}
}
}
- film->make_dcp ();
+ film->make_dcp (TranscodeJob::ChangedBehaviour::STOP);
} catch (std::exception& e) {
- wxString p = std_to_wx (path.string ());
- wxCharBuffer b = p.ToUTF8 ();
- error_dialog (this, wxString::Format (_("Could not open film at %s"), p.data()), std_to_wx(e.what()));
+ auto p = std_to_wx (path.string ());
+ auto b = p.ToUTF8 ();
+ error_dialog (this, wxString::Format(_("Could not open film at %s"), p.data()), std_to_wx(e.what()));
}
}
bool should_close ()
{
- if (!JobManager::instance()->work_to_do ()) {
+ if (!JobManager::instance()->work_to_do()) {
return true;
}
- wxMessageDialog* d = new wxMessageDialog (
+ auto d = new wxMessageDialog (
0,
_("There are unfinished jobs; are you sure you want to quit?"),
_("Unfinished jobs"),
void close (wxCloseEvent& ev)
{
- if (!should_close ()) {
+ if (!should_close()) {
ev.Veto ();
return;
}
void file_quit ()
{
- if (should_close ()) {
+ if (should_close()) {
Close (true);
}
}
void help_about ()
{
- AboutDialog* d = new AboutDialog (this);
+ auto d = new AboutDialog (this);
d->ShowModal ();
d->Destroy ();
}
void add_film ()
{
- wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
+ auto c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
if (_last_parent) {
- c->SetPath (std_to_wx (_last_parent.get().string ()));
+ c->SetPath (std_to_wx(_last_parent.get().string()));
}
int r;
} catch (exception& e) {
error_dialog (
this,
- wxString::Format (
+ wxString::Format(
_("Could not write to cinemas file at %s. Your changes have not been saved."),
std_to_wx (Config::instance()->cinemas_file().string()).data()
)
} catch (exception& e) {
error_dialog (
this,
- wxString::Format (
+ wxString::Format(
_("Could not write to config file at %s. Your changes have not been saved."),
std_to_wx (Config::instance()->cinemas_file().string()).data()
)
boost::optional<boost::filesystem::path> _last_parent;
wxSizer* _sizer;
- wxPreferencesEditor* _config_dialog;
- ServersListDialog* _servers_list_dialog;
+ wxPreferencesEditor* _config_dialog = nullptr;
+ ServersListDialog* _servers_list_dialog = nullptr;
wxButton* _pause;
wxButton* _resume;
};
+
static const wxCmdLineEntryDesc command_line_description[] = {
{ wxCMD_LINE_PARAM, 0, 0, "film to load", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
};
+
class JobServer : public Server
{
public:
{
try {
int const length = socket->read_uint32 ();
- scoped_array<char> buffer (new char[length]);
- socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
+ scoped_array<char> buffer(new char[length]);
+ socket->read (reinterpret_cast<uint8_t*>(buffer.get()), length);
string s (buffer.get());
_frame->start_job (s);
- socket->write (reinterpret_cast<uint8_t const *> ("OK"), 3);
+ socket->write (reinterpret_cast<uint8_t const *>("OK"), 3);
} catch (...) {
}
DOMFrame* _frame;
};
+
class App : public wxApp
{
bool OnInit ()
{
+ wxInitAllImageHandlers ();
+
SetAppName (_("DCP-o-matic Batch Converter"));
is_batch_converter = true;
- Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
- Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+ Config::FailedToLoad.connect (boost::bind(&App::config_failed_to_load, this));
+ Config::Warning.connect (boost::bind(&App::config_warning, this, _1));
- wxSplashScreen* splash = maybe_show_splash ();
+ auto splash = maybe_show_splash ();
if (!wxApp::OnInit()) {
return false;
}
_frame->Show ();
- JobServer* server = new JobServer (_frame);
+ auto server = new JobServer (_frame);
new thread (boost::bind (&JobServer::run, server));
signal_manager = new wxSignalManager (this);
this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
shared_ptr<Film> film;
- BOOST_FOREACH (boost::filesystem::path i, films_to_load) {
- if (boost::filesystem::is_directory (i)) {
+ for (auto i: films_to_load) {
+ if (boost::filesystem::is_directory(i)) {
try {
- film.reset (new Film (i));
+ film = make_shared<Film>(i);
film->read_metadata ();
- film->make_dcp ();
+ film->make_dcp (TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
} catch (exception& e) {
error_dialog (
0,
- std_to_wx (String::compose (wx_to_std (_("Could not load film %1")), i.string())),
+ std_to_wx(String::compose(wx_to_std(_("Could not load film %1")), i.string())),
std_to_wx(e.what())
);
}
bool OnCmdLineParsed (wxCmdLineParser& parser)
{
for (size_t i = 0; i < parser.GetParamCount(); ++i) {
- films_to_load.push_back (wx_to_std (parser.GetParam(i)));
+ films_to_load.push_back (wx_to_std(parser.GetParam(i)));
}
return true;
void config_warning (string m)
{
- message_dialog (_frame, std_to_wx (m));
+ message_dialog (_frame, std_to_wx(m));
}
DOMFrame* _frame;
};
+
IMPLEMENT_APP (App)
projects / dcpomatic.git / blobdiff