*/
-#include <wx/aboutdlg.h>
-#include <wx/stdpaths.h>
-#include <wx/cmdline.h>
-#include <wx/wx.h>
+#include "wx/wx_util.h"
+#include "wx/about_dialog.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/job_manager_view.h"
+#include "wx/config_dialog.h"
+#include "wx/servers_list_dialog.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 "wx/wx_util.h"
-#include "wx/about_dialog.h"
-#include "wx/wx_signal_manager.h"
-#include "wx/job_manager_view.h"
+#include "lib/dcpomatic_socket.h"
+#include <wx/aboutdlg.h>
+#include <wx/stdpaths.h>
+#include <wx/cmdline.h>
+#include <wx/preferences.h>
+#include <wx/wx.h>
+#include <iostream>
using std::exception;
+using std::string;
+using std::cout;
using boost::shared_ptr;
+using boost::thread;
+using boost::scoped_array;
static std::string film_to_load;
enum {
ID_file_add_film = 1,
- ID_file_quit,
+ ID_tools_encoding_servers,
ID_help_about
};
{
wxMenu* file = new wxMenu;
file->Append (ID_file_add_film, _("&Add Film..."));
- file->Append (ID_file_quit, _("&Quit"));
+#ifdef DCPOMATIC_OSX
+ file->Append (wxID_EXIT, _("&Exit"));
+#else
+ file->Append (wxID_EXIT, _("&Quit"));
+#endif
+
+#ifdef DCPOMATIC_OSX
+ file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+#else
+ wxMenu* edit = new wxMenu;
+ edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+#endif
+
+ wxMenu* tools = new wxMenu;
+ tools->Append (ID_tools_encoding_servers, _("Encoding servers..."));
wxMenu* help = new wxMenu;
help->Append (ID_help_about, _("About"));
m->Append (file, _("&File"));
+#ifndef DCPOMATIC_OSX
+ m->Append (edit, _("&Edit"));
+#endif
+ m->Append (tools, _("&Tools"));
m->Append (help, _("&Help"));
}
-class Frame : public wxFrame
+class DOMFrame : public wxFrame
{
public:
- Frame (wxString const & title)
+ DOMFrame (wxString const & title)
: wxFrame (NULL, -1, title)
, _sizer (new wxBoxSizer (wxVERTICAL))
+ , _config_dialog (0)
+ , _servers_list_dialog (0)
{
wxMenuBar* bar = new wxMenuBar;
setup_menu (bar);
SetMenuBar (bar);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_add_film, this), ID_file_add_film);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_quit, this), ID_file_quit);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_about, this), ID_help_about);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_add_film, this), ID_file_add_film);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_quit, this), wxID_EXIT);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this), ID_help_about);
wxPanel* panel = new wxPanel (this);
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
wxButton* add = new wxButton (panel, wxID_ANY, _("Add Film..."));
- add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&Frame::add_film, this));
+ add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DOMFrame::add_film, this));
buttons->Add (add, 1, wxALL, 6);
_sizer->Add (buttons, 0, wxALL, 6);
panel->SetSizer (_sizer);
- Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1));
- Bind (wxEVT_SIZE, boost::bind (&Frame::sized, this, _1));
+ Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1));
+ Bind (wxEVT_SIZE, boost::bind (&DOMFrame::sized, this, _1));
+ }
+
+ void start_job (boost::filesystem::path path)
+ {
+ try {
+ shared_ptr<Film> film (new Film (path));
+ film->read_metadata ();
+ film->make_dcp ();
+ } 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 (%s)"), p.data(), std_to_wx (e.what()).data()));
+ }
}
private:
_sizer->Layout ();
ev.Skip ();
}
-
+
bool should_close ()
{
if (!JobManager::instance()->work_to_do ()) {
d->Destroy ();
return r;
}
-
+
void close (wxCloseEvent& ev)
{
if (!should_close ()) {
{
add_film ();
}
-
+
void file_quit ()
{
if (should_close ()) {
}
}
+ void edit_preferences ()
+ {
+ if (!_config_dialog) {
+ _config_dialog = create_config_dialog ();
+ }
+ _config_dialog->Show (this);
+ }
+
+ void tools_encoding_servers ()
+ {
+ if (!_servers_list_dialog) {
+ _servers_list_dialog = new ServersListDialog (this);
+ }
+
+ _servers_list_dialog->Show ();
+ }
+
void help_about ()
{
AboutDialog* d = new AboutDialog (this);
if (_last_parent) {
c->SetPath (std_to_wx (_last_parent.get().string ()));
}
-
+
int r;
while (true) {
r = c->ShowModal ();
break;
}
}
-
+
if (r == wxID_OK) {
- try {
- shared_ptr<Film> film (new Film (wx_to_std (c->GetPath ())));
- film->read_metadata ();
- film->make_dcp ();
- } catch (std::exception& e) {
- wxString p = c->GetPath ();
- wxCharBuffer b = p.ToUTF8 ();
- error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data()));
- }
+ start_job (wx_to_std (c->GetPath ()));
}
_last_parent = boost::filesystem::path (wx_to_std (c->GetPath ())).parent_path ();
boost::optional<boost::filesystem::path> _last_parent;
wxSizer* _sizer;
+ wxPreferencesEditor* _config_dialog;
+ ServersListDialog* _servers_list_dialog;
};
static const wxCmdLineEntryDesc command_line_description[] = {
{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
};
+class JobServer : public Server
+{
+public:
+ JobServer (DOMFrame* frame)
+ : Server (Config::instance()->server_port_base() + 2)
+ , _frame (frame)
+ {}
+
+ void handle (shared_ptr<Socket> socket)
+ {
+ try {
+ int const length = socket->read_uint32 ();
+ 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);
+ } catch (...) {
+
+ }
+ }
+
+private:
+ DOMFrame* _frame;
+};
+
class App : public wxApp
{
bool OnInit ()
{
+ SetAppName (_("DCP-o-matic Batch Converter"));
+
if (!wxApp::OnInit()) {
return false;
}
-
-#ifdef DCPOMATIC_LINUX
+
+#ifdef DCPOMATIC_LINUX
unsetenv ("UBUNTU_MENUPROXY");
-#endif
+#endif
+
+ dcpomatic_setup_path_encoding ();
/* Enable i18n; this will create a Config object
to look for a force-configured language. This Config
*/
Config::drop ();
- Frame* f = new Frame (_("DCP-o-matic Batch Converter"));
+ DOMFrame* f = new DOMFrame (_("DCP-o-matic Batch Converter"));
SetTopWindow (f);
f->Maximize ();
f->Show ();
+ JobServer* server = new JobServer (f);
+ new thread (boost::bind (&JobServer::run, server));
+
signal_manager = new wxSignalManager (this);
this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));