Merge master.
[dcpomatic.git] / src / tools / dcpomatic.cc
index ab8c4536de3a1f75d8c83eeca13a8f6e8e5264c7..8c7f09ae77de6fd4e8344ca12f3a528617991a6a 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,6 +29,8 @@
 #include <wx/generic/aboutdlgg.h>
 #include <wx/stdpaths.h>
 #include <wx/cmdline.h>
+#include <wx/preferences.h>
+#include <dcp/exceptions.h>
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
 #include "wx/wx_ui_signaller.h"
 #include "wx/about_dialog.h"
 #include "wx/kdm_dialog.h"
+#include "wx/servers_list_dialog.h"
+#include "wx/hints_dialog.h"
+#include "wx/update_dialog.h"
+#include "wx/content_panel.h"
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/exceptions.h"
 #include "lib/cinema.h"
 #include "lib/kdm.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/server_finder.h"
+#include "lib/update.h"
+#include "lib/content_factory.h"
 
 using std::cout;
 using std::string;
@@ -60,19 +70,16 @@ using std::map;
 using std::make_pair;
 using std::list;
 using std::exception;
-using std::ofstream;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-static FilmEditor* film_editor = 0;
-static FilmViewer* film_viewer = 0;
 static shared_ptr<Film> film;
-static std::string log_level;
 static std::string film_to_load;
 static std::string film_to_create;
+static std::string content_to_add;
 static wxMenu* jobs_menu = 0;
 
-static void set_menu_sensitivity ();
+// #define DCPOMATIC_WINDOWS_CONSOLE 1
 
 class FilmChangedDialog
 {
@@ -105,7 +112,7 @@ private:
 };
 
 
-void
+static void
 maybe_save_then_delete_film ()
 {
        if (!film) {
@@ -126,43 +133,42 @@ maybe_save_then_delete_film ()
        film.reset ();
 }
 
-#define ALWAYS                  0x0
-#define NEEDS_FILM              0x1
-#define NOT_DURING_DCP_CREATION 0x2
-
-map<wxMenuItem*, int> menu_items;
-       
-void
-add_item (wxMenu* menu, wxString text, int id, int sens)
+static void
+check_film_state_version (int v)
 {
-       wxMenuItem* item = menu->Append (id, text);
-       menu_items.insert (make_pair (item, sens));
+       if (v == 4) {
+               error_dialog (
+                       0,
+                       _("This film was created with an old version of DVD-o-matic and may not load correctly "
+                         "in this version.  Please check the film's settings carefully.")
+                       );
+       }
 }
 
-void
-set_menu_sensitivity ()
+static void
+load_film (boost::filesystem::path file)
 {
-       list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-       list<shared_ptr<Job> >::iterator i = jobs.begin();
-       while (i != jobs.end() && dynamic_pointer_cast<TranscodeJob> (*i) == 0) {
-               ++i;
+       film.reset (new Film (file));
+       list<string> const notes = film->read_metadata ();
+       check_film_state_version (film->state_version ());
+       for (list<string>::const_iterator i = notes.begin(); i != notes.end(); ++i) {
+               error_dialog (0, std_to_wx (*i));
        }
-       bool const dcp_creation = (i != jobs.end ());
-
-       for (map<wxMenuItem*, int>::iterator j = menu_items.begin(); j != menu_items.end(); ++j) {
-
-               bool enabled = true;
+}
 
-               if ((j->second & NEEDS_FILM) && film == 0) {
-                       enabled = false;
-               }
+#define ALWAYS                       0x0
+#define NEEDS_FILM                   0x1
+#define NOT_DURING_DCP_CREATION      0x2
+#define NEEDS_CPL                    0x4
+#define NEEDS_SELECTED_VIDEO_CONTENT 0x8
 
-               if ((j->second & NOT_DURING_DCP_CREATION) && dcp_creation) {
-                       enabled = false;
-               }
-               
-               j->first->Enable (enabled);
-       }
+map<wxMenuItem*, int> menu_items;
+       
+static void
+add_item (wxMenu* menu, wxString text, int id, int sens)
+{
+       wxMenuItem* item = menu->Append (id, text);
+       menu_items.insert (make_pair (item, sens));
 }
 
 enum {
@@ -170,13 +176,18 @@ enum {
        ID_file_open,
        ID_file_save,
        ID_file_properties,
+       ID_content_scale_to_fit_width,
+       ID_content_scale_to_fit_height,
        ID_jobs_make_dcp,
        ID_jobs_make_kdms,
        ID_jobs_send_dcp_to_tms,
        ID_jobs_show_dcp,
+       ID_tools_hints,
+       ID_tools_encoding_servers,
+       ID_tools_check_for_updates
 };
 
-void
+static void
 setup_menu (wxMenuBar* m)
 {
        wxMenu* file = new wxMenu;
@@ -202,13 +213,22 @@ setup_menu (wxMenuBar* m)
 #else
        wxMenu* edit = new wxMenu;
        add_item (edit, _("&Preferences..."), wxID_PREFERENCES, ALWAYS);
-#endif 
+#endif
+
+       wxMenu* content = new wxMenu;
+       add_item (content, _("Scale to fit &width"), ID_content_scale_to_fit_width, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT);
+       add_item (content, _("Scale to fit &height"), ID_content_scale_to_fit_height, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT);
 
        jobs_menu = new wxMenu;
        add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION);
        add_item (jobs_menu, _("Make &KDMs..."), ID_jobs_make_kdms, NEEDS_FILM);
-       add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION);
-       add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION);
+       add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+       add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+
+       wxMenu* tools = new wxMenu;
+       add_item (tools, _("Hints..."), ID_tools_hints, 0);
+       add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0);
+       add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0);
 
        wxMenu* help = new wxMenu;
 #ifdef __WXOSX__       
@@ -220,8 +240,10 @@ setup_menu (wxMenuBar* m)
        m->Append (file, _("&File"));
 #ifndef __WXOSX__      
        m->Append (edit, _("&Edit"));
-#endif 
+#endif
+       m->Append (content, _("&Content"));
        m->Append (jobs_menu, _("&Jobs"));
+       m->Append (tools, _("&Tools"));
        m->Append (help, _("&Help"));
 }
 
@@ -230,24 +252,47 @@ class Frame : public wxFrame
 public:
        Frame (wxString const & title)
                : wxFrame (NULL, -1, title)
+               , _hints_dialog (0)
+               , _servers_list_dialog (0)
+               , _config_dialog (0)
        {
+#if defined(DCPOMATIC_WINDOWS) && defined(DCPOMATIC_WINDOWS_CONSOLE)
+                AllocConsole();
+               
+               HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
+               int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT);
+               FILE* hf_out = _fdopen(hCrt, "w");
+               setvbuf(hf_out, NULL, _IONBF, 1);
+               *stdout = *hf_out;
+               
+               HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE);
+               hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT);
+               FILE* hf_in = _fdopen(hCrt, "r");
+               setvbuf(hf_in, NULL, _IONBF, 128);
+               *stdin = *hf_in;
+#endif
+
                wxMenuBar* bar = new wxMenuBar;
                setup_menu (bar);
                SetMenuBar (bar);
 
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_new, this),             ID_file_new);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_open, this),            ID_file_open);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_save, this),            ID_file_save);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_properties, this),      ID_file_properties);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_exit, this),            wxID_EXIT);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::edit_preferences, this),     wxID_PREFERENCES);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_make_dcp, this),        ID_jobs_make_dcp);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_make_kdms, this),       ID_jobs_make_kdms);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_send_dcp_to_tms, this), ID_jobs_send_dcp_to_tms);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_show_dcp, this),        ID_jobs_show_dcp);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_about, this),           wxID_ABOUT);
-
-               Bind (wxEVT_MENU_OPEN, boost::bind (&Frame::menu_opened, this, _1));
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_new, this),                ID_file_new);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_open, this),               ID_file_open);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_save, this),               ID_file_save);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_properties, this),         ID_file_properties);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_exit, this),               wxID_EXIT);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::edit_preferences, this),        wxID_PREFERENCES);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::content_scale_to_fit_width, this), ID_content_scale_to_fit_width);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::content_scale_to_fit_height, this), ID_content_scale_to_fit_height);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_make_dcp, this),           ID_jobs_make_dcp);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_make_kdms, this),          ID_jobs_make_kdms);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_send_dcp_to_tms, this),    ID_jobs_send_dcp_to_tms);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::jobs_show_dcp, this),           ID_jobs_show_dcp);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_hints, this),             ID_tools_hints);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_encoding_servers, this),  ID_tools_encoding_servers);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_check_for_updates, this), ID_tools_check_for_updates);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_about, this),              wxID_ABOUT);
+
                Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1));
 
                /* Use a panel as the only child of the Frame so that we avoid
@@ -255,28 +300,28 @@ public:
                */
                wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
 
-               film_editor = new FilmEditor (film, overall_panel);
-               film_viewer = new FilmViewer (film, overall_panel);
+               _film_editor = new FilmEditor (film, overall_panel);
+               _film_viewer = new FilmViewer (film, overall_panel);
                JobManagerView* job_manager_view = new JobManagerView (overall_panel, static_cast<JobManagerView::Buttons> (0));
 
                wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL);
-               right_sizer->Add (film_viewer, 2, wxEXPAND | wxALL, 6);
+               right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6);
                right_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
 
                wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
-               main_sizer->Add (film_editor, 1, wxEXPAND | wxALL, 6);
+               main_sizer->Add (_film_editor, 1, wxEXPAND | wxALL, 6);
                main_sizer->Add (right_sizer, 2, wxEXPAND | wxALL, 6);
 
                set_menu_sensitivity ();
 
-               film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
+               _film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
                if (film) {
                        file_changed (film->directory ());
                } else {
                        file_changed ("");
                }
 
-               JobManager::instance()->ActiveJobsChanged.connect (boost::bind (set_menu_sensitivity));
+               JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&Frame::set_menu_sensitivity, this));
 
                set_film ();
                overall_panel->SetSizer (main_sizer);
@@ -284,33 +329,21 @@ public:
 
 private:
 
-       void menu_opened (wxMenuEvent& ev)
-       {
-               if (ev.GetMenu() != jobs_menu) {
-                       return;
-               }
-
-               bool const have_dcp = false;//film && film->have_dcp();
-               jobs_menu->Enable (ID_jobs_send_dcp_to_tms, have_dcp);
-               jobs_menu->Enable (ID_jobs_show_dcp, have_dcp);
-       }
-
        void set_film ()
        {
-               film_viewer->set_film (film);
-               film_editor->set_film (film);
+               _film_viewer->set_film (film);
+               _film_editor->set_film (film);
                set_menu_sensitivity ();
        }
 
-       void file_changed (string f)
+       void file_changed (boost::filesystem::path f)
        {
-               stringstream s;
-               s << wx_to_std (_("DCP-o-matic"));
+               string s = wx_to_std (_("DCP-o-matic"));
                if (!f.empty ()) {
-                       s << " - " << f;
+                       s += " - " + f.string ();
                }
                
-               SetTitle (std_to_wx (s.str()));
+               SetTitle (std_to_wx (s));
        }
        
        void file_new ()
@@ -326,7 +359,7 @@ private:
                                            std_to_wx (
                                                    String::compose (wx_to_std (_("The directory %1 already exists and is not empty.  "
                                                                                  "Are you sure you want to use it?")),
-                                                                    d->get_path().c_str())
+                                                                    d->get_path().string().c_str())
                                                    )
                                            )) {
                                        return;
@@ -342,7 +375,6 @@ private:
                        maybe_save_then_delete_film ();
                        film.reset (new Film (d->get_path ()));
                        film->write_metadata ();
-                       film->log()->set_level (log_level);
                        film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string());
                        set_film ();
                }
@@ -352,9 +384,15 @@ private:
 
        void file_open ()
        {
-               wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
+               wxDirDialog* c = new wxDirDialog (
+                       this,
+                       _("Select film to open"),
+                       std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()),
+                       wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST
+                       );
+               
                int r;
-               while (1) {
+               while (true) {
                        r = c->ShowModal ();
                        if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) {
                                error_dialog (this, _("You did not select a folder.  Make sure that you select a folder before clicking Open."));
@@ -366,9 +404,7 @@ private:
                if (r == wxID_OK) {
                        maybe_save_then_delete_film ();
                        try {
-                               film.reset (new Film (wx_to_std (c->GetPath ())));
-                               film->read_metadata ();
-                               film->log()->set_level (log_level);
+                               load_film (wx_to_std (c->GetPath ()));
                                set_film ();
                        } catch (std::exception& e) {
                                wxString p = c->GetPath ();
@@ -394,24 +430,29 @@ private:
        
        void file_exit ()
        {
-               if (!should_close ()) {
-                       return;
-               }
-               
-               maybe_save_then_delete_film ();
-               Close (true);
+               /* false here allows the close handler to veto the close request */
+               Close (false);
        }
 
        void edit_preferences ()
        {
-               ConfigDialog* d = new ConfigDialog (this);
-               d->ShowModal ();
-               d->Destroy ();
-               Config::instance()->write ();
+               if (!_config_dialog) {
+                       _config_dialog = create_config_dialog ();
+               }
+               _config_dialog->Show (this);
        }
 
        void jobs_make_dcp ()
        {
+               double required;
+               double available;
+
+               if (!film->should_be_enough_disk_space (required, available)) {
+                       if (!confirm_dialog (this, wxString::Format (_("The DCP for this film will take up about %.1f Gb, and the disk that you are using only has %.1f Gb available.  Do you want to continue anyway?"), required, available))) {
+                               return;
+                       }
+               }
+               
                JobWrapper::make_dcp (this, film);
        }
 
@@ -421,7 +462,7 @@ private:
                        return;
                }
                
-               KDMDialog* d = new KDMDialog (this);
+               KDMDialog* d = new KDMDialog (this, film);
                if (d->ShowModal () != wxID_OK) {
                        d->Destroy ();
                        return;
@@ -429,16 +470,38 @@ private:
 
                try {
                        if (d->write_to ()) {
-                               write_kdm_files (film, d->screens (), d->from (), d->until (), d->directory ());
+                               write_kdm_files (film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation (), d->directory ());
                        } else {
-                               email_kdms (film, d->screens (), d->from (), d->until ());
+                               JobManager::instance()->add (
+                                       shared_ptr<Job> (new SendKDMEmailJob (film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation ()))
+                                       );
                        }
-               } catch (KDMError& e) {
+               } catch (dcp::NotEncryptedError& e) {
+                       error_dialog (this, _("CPL's content is not encrypted."));
+               } catch (exception& e) {
                        error_dialog (this, e.what ());
+               } catch (...) {
+                       error_dialog (this, _("An unknown exeception occurred."));
                }
        
                d->Destroy ();
        }
+
+       void content_scale_to_fit_width ()
+       {
+               VideoContentList vc = _film_editor->content_panel()->selected_video ();
+               for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
+                       (*i)->scale_and_crop_to_fit_width ();
+               }
+       }
+
+       void content_scale_to_fit_height ()
+       {
+               VideoContentList vc = _film_editor->content_panel()->selected_video ();
+               for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
+                       (*i)->scale_and_crop_to_fit_height ();
+               }
+       }
        
        void jobs_send_dcp_to_tms ()
        {
@@ -448,21 +511,21 @@ private:
        void jobs_show_dcp ()
        {
 #ifdef __WXMSW__
-               string d = film->directory();
+               string d = film->directory().string ();
                wstring w;
                w.assign (d.begin(), d.end());
                ShellExecute (0, L"open", w.c_str(), 0, 0, SW_SHOWDEFAULT);
 #else
                int r = system ("which nautilus");
                if (WEXITSTATUS (r) == 0) {
-                       r = system (string ("nautilus " + film->directory()).c_str ());
+                       r = system (string ("nautilus " + film->directory().string()).c_str ());
                        if (WEXITSTATUS (r)) {
                                error_dialog (this, _("Could not show DCP (could not run nautilus)"));
                        }
                } else {
                        int r = system ("which konqueror");
                        if (WEXITSTATUS (r) == 0) {
-                               r = system (string ("konqueror " + film->directory()).c_str ());
+                               r = system (string ("konqueror " + film->directory().string()).c_str ());
                                if (WEXITSTATUS (r)) {
                                        error_dialog (this, _("Could not show DCP (could not run konqueror)"));
                                }
@@ -471,6 +534,29 @@ private:
 #endif         
        }
 
+       void tools_hints ()
+       {
+               if (!_hints_dialog) {
+                       _hints_dialog = new HintsDialog (this, film);
+               }
+
+               _hints_dialog->Show ();
+       }
+
+       void tools_encoding_servers ()
+       {
+               if (!_servers_list_dialog) {
+                       _servers_list_dialog = new ServersListDialog (this);
+               }
+
+               _servers_list_dialog->Show ();
+       }
+
+       void tools_check_for_updates ()
+       {
+               UpdateChecker::instance()->run ();
+       }
+
        void help_about ()
        {
                AboutDialog* d = new AboutDialog (this);
@@ -503,26 +589,63 @@ private:
                        return;
                }
 
+               maybe_save_then_delete_film ();
+
                ev.Skip ();
-       }       
+       }
+
+       void set_menu_sensitivity ()
+       {
+               list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
+               list<shared_ptr<Job> >::iterator i = jobs.begin();
+               while (i != jobs.end() && dynamic_pointer_cast<TranscodeJob> (*i) == 0) {
+                       ++i;
+               }
+               bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished ();
+               bool const have_cpl = film && !film->cpls().empty ();
+               bool const have_selected_video_content = !_film_editor->content_panel()->selected_video().empty();
+               
+               for (map<wxMenuItem*, int>::iterator j = menu_items.begin(); j != menu_items.end(); ++j) {
+                       
+                       bool enabled = true;
+                       
+                       if ((j->second & NEEDS_FILM) && film == 0) {
+                               enabled = false;
+                       }
+                       
+                       if ((j->second & NOT_DURING_DCP_CREATION) && dcp_creation) {
+                               enabled = false;
+                       }
+                       
+                       if ((j->second & NEEDS_CPL) && !have_cpl) {
+                               enabled = false;
+                       }
+                       
+                       if ((j->second & NEEDS_SELECTED_VIDEO_CONTENT) && !have_selected_video_content) {
+                               enabled = false;
+                       }
+                       
+                       j->first->Enable (enabled);
+               }
+       }
+       
+       FilmEditor* _film_editor;
+       FilmViewer* _film_viewer;
+       HintsDialog* _hints_dialog;
+       ServersListDialog* _servers_list_dialog;
+       wxPreferencesEditor* _config_dialog;
 };
 
-#if wxMINOR_VERSION == 9
 static const wxCmdLineEntryDesc command_line_description[] = {
-       { wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-       { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
+       { wxCMD_LINE_OPTION, "c", "content", "add content file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+       { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
        { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
-#else
-static const wxCmdLineEntryDesc command_line_description[] = {
-       { wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-       { wxCMD_LINE_SWITCH, wxT("n"), wxT("new"), wxT("create new film"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-       { wxCMD_LINE_PARAM, 0, 0, wxT("film to load or create"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
-       { wxCMD_LINE_NONE, wxT(""), wxT(""), wxT(""), wxCmdLineParamType (0), 0 }
-};
-#endif
 
+/** @class App
+ *  @brief The magic App class for wxWidgets.
+ */
 class App : public wxApp
 {
        bool OnInit ()
@@ -566,9 +689,7 @@ class App : public wxApp
 
                if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
                        try {
-                               film.reset (new Film (film_to_load));
-                               film->read_metadata ();
-                               film->log()->set_level (log_level);
+                               load_film (film_to_load);
                        } catch (exception& e) {
                                error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what())));
                        }
@@ -577,17 +698,33 @@ class App : public wxApp
                if (!film_to_create.empty ()) {
                        film.reset (new Film (film_to_create));
                        film->write_metadata ();
-                       film->log()->set_level (log_level);
                        film->set_name (boost::filesystem::path (film_to_create).filename().generic_string ());
                }
 
-               Frame* f = new Frame (_("DCP-o-matic"));
-               SetTopWindow (f);
-               f->Maximize ();
-               f->Show ();
+               if (!content_to_add.empty ()) {
+                       film->examine_and_add_content (content_factory (film, content_to_add));
+               }
+
+               _frame = new Frame (_("DCP-o-matic"));
+               SetTopWindow (_frame);
+               _frame->Maximize ();
+               _frame->Show ();
 
                ui_signaller = new wxUISignaller (this);
-               this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
+               Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
+
+               Bind (wxEVT_TIMER, boost::bind (&App::check, this));
+               _timer.reset (new wxTimer (this));
+               _timer->Start (1000);
+
+               if (film) {
+                       check_film_state_version (film->state_version ());
+               }
+
+               UpdateChecker::instance()->StateChanged.connect (boost::bind (&App::update_checker_state_changed, this));
+               if (Config::instance()->check_for_updates ()) {
+                       UpdateChecker::instance()->run ();
+               }
 
                return true;
        }
@@ -609,22 +746,73 @@ class App : public wxApp
                        if (parser.Found (wxT ("new"))) {
                                film_to_create = wx_to_std (parser.GetParam (0));
                        } else {
-                               film_to_load = wx_to_std (parser.GetParam(0));
+                               film_to_load = wx_to_std (parser.GetParam (0));
                        }
                }
 
-               wxString log;
-               if (parser.Found (wxT ("log"), &log)) {
-                       log_level = wx_to_std (log);
+               wxString content;
+               if (parser.Found (wxT ("content"), &content)) {
+                       content_to_add = wx_to_std (content);
                }
 
                return true;
        }
 
+       bool OnExceptionInMainLoop ()
+       {
+               error_dialog (0, _("An unknown exception occurred.  Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+               return false;
+       }
+               
+       void OnUnhandledException ()
+       {
+               error_dialog (0, _("An unknown exception occurred.  Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+       }
+
        void idle ()
        {
                ui_signaller->ui_idle ();
        }
+
+       void check ()
+       {
+               try {
+                       ServerFinder::instance()->rethrow ();
+               } catch (exception& e) {
+                       error_dialog (0, std_to_wx (e.what ()));
+               }
+       }
+
+       void update_checker_state_changed ()
+       {
+               switch (UpdateChecker::instance()->state ()) {
+               case UpdateChecker::YES:
+               {
+                       string test;
+                       if (Config::instance()->check_for_test_updates ()) {
+                               test = UpdateChecker::instance()->test ();
+                       }
+                       UpdateDialog* dialog = new UpdateDialog (_frame, UpdateChecker::instance()->stable (), test);
+                       dialog->ShowModal ();
+                       dialog->Destroy ();
+                       break;
+               }
+               case UpdateChecker::NO:
+                       if (!UpdateChecker::instance()->last_emit_was_first ()) {
+                               error_dialog (_frame, _("There are no new versions of DCP-o-matic available."));
+                       }
+                       break;
+               case UpdateChecker::FAILED:
+                       if (!UpdateChecker::instance()->last_emit_was_first ()) {
+                               error_dialog (_frame, _("The DCP-o-matic download server could not be contacted."));
+                       }
+               default:
+                       break;
+               }
+       }
+
+       Frame* _frame;
+       shared_ptr<wxTimer> _timer;
 };
 
 IMPLEMENT_APP (App)