#include "wx/full_config_dialog.h"
#include "wx/job_manager_view.h"
#include "wx/servers_list_dialog.h"
+#include "wx/wx_ptr.h"
#include "wx/wx_signal_manager.h"
#include "wx/wx_util.h"
#include "lib/compose.hpp"
#include "lib/job.h"
#include "lib/job_manager.h"
#include "lib/make_dcp.h"
-#include "lib/scope_guard.h"
#include "lib/transcode_job.h"
#include "lib/util.h"
#include "lib/version.h"
return true;
}
- auto d = new wxMessageDialog (
- 0,
+ auto d = make_wx<wxMessageDialog>(
+ nullptr,
_("There are unfinished jobs; are you sure you want to quit?"),
_("Unfinished jobs"),
wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
);
- ScopeGuard sg = [d]{ d->Destroy(); };
return d->ShowModal() == wxID_YES;
}
void help_about ()
{
- auto d = new AboutDialog (this);
- ScopeGuard sg = [d]() { d->Destroy(); };
+ auto d = make_wx<AboutDialog>(this);
d->ShowModal ();
}
void add_film ()
{
- auto dialog = new wxDirDialog(this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
- ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+ auto dialog = make_wx<wxDirDialog>(this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
if (_last_parent) {
dialog->SetPath(std_to_wx(_last_parent.get().string()));
}
};
-class JobServer : public Server
+class JobServer : public Server, public Signaller
{
public:
- explicit JobServer (DOMFrame* frame)
+ JobServer()
: Server (BATCH_JOB_PORT)
- , _frame (frame)
{}
void handle (shared_ptr<Socket> socket) override
scoped_array<char> buffer(new char[length]);
socket->read (reinterpret_cast<uint8_t*>(buffer.get()), length);
string s (buffer.get());
- _frame->start_job (s);
+ emit(boost::bind(boost::ref(StartJob), s));
socket->write (reinterpret_cast<uint8_t const *>("OK"), 3);
} catch (...) {
}
}
-private:
- DOMFrame* _frame;
+ boost::signals2::signal<void(std::string)> StartJob;
};
_frame->Show ();
try {
- auto server = new JobServer (_frame);
+ auto server = new JobServer();
+ server->StartJob.connect(bind(&DOMFrame::start_job, _frame, _1));
new thread (boost::bind (&JobServer::run, server));
} catch (boost::system::system_error& e) {
error_dialog(_frame, _("Could not listen for new batch jobs. Perhaps another instance of the DCP-o-matic Batch Converter is running."));