#include "lib/util.h"
#include "lib/update_checker.h"
#include "lib/compose.hpp"
-#include "lib/encode_server_finder.h"
#include "lib/dcp_content.h"
#include "lib/job_manager.h"
#include "lib/job.h"
#include <wx/splash.h>
#include <wx/cmdline.h>
#include <wx/preferences.h>
+#include <wx/progdlg.h>
#ifdef __WXOSX__
#include <ApplicationServices/ApplicationServices.h>
#endif
ID_file_open = 1,
ID_file_add_ov,
ID_file_add_kdm,
+ ID_file_close,
ID_view_scale_appropriate,
ID_view_scale_full,
ID_view_scale_half,
wxMenuBar* bar = new wxMenuBar;
setup_menu (bar);
+ set_menu_sensitivity ();
SetMenuBar (bar);
#ifdef DCPOMATIC_WINDOWS
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_open, this), ID_file_open);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_add_ov, this), ID_file_add_ov);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_add_kdm, this), ID_file_add_kdm);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_close, this), ID_file_close);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this), wxID_EXIT);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::set_decode_reduction, this, optional<int>()), ID_view_scale_appropriate);
void set_decode_reduction (optional<int> reduction)
{
_viewer->set_dcp_decode_reduction (reduction);
+ _info->triggered_update ();
}
void load_dcp (boost::filesystem::path dir)
{
_film.reset (new Film (optional<boost::filesystem::path>()));
shared_ptr<DCPContent> dcp (new DCPContent (_film, dir));
- _film->examine_and_add_content (dcp);
+ _film->examine_and_add_content (dcp, true);
JobManager* jm = JobManager::instance ();
- while (jm->work_to_do ()) {
- /* XXX: progress dialog */
- while (signal_manager->ui_idle ()) {}
+
+ wxProgressDialog* progress = new wxProgressDialog (_("DCP-o-matic Player"), _("Loading DCP"));
+
+ while (jm->work_to_do() || signal_manager->ui_idle()) {
dcpomatic_sleep (1);
+ progress->Pulse ();
}
- while (signal_manager->ui_idle ()) {}
+ progress->Destroy ();
- if (jm->errors ()) {
- wxString errors;
- BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
- if (i->finished_in_error()) {
- errors += std_to_wx (i->error_summary()) + ".\n";
- }
- }
- error_dialog (this, errors);
+ DCPOMATIC_ASSERT (!jm->get().empty());
+
+ shared_ptr<Job> last = jm->get().back();
+ if (last->finished_in_error()) {
+ error_dialog (this, std_to_wx (last->error_summary()) + ".\n");
return;
}
}
_viewer->set_film (_film);
+ _viewer->set_position (DCPTime ());
_info->triggered_update ();
+
+ set_menu_sensitivity ();
}
private:
{
wxMenu* file = new wxMenu;
file->Append (ID_file_open, _("&Open...\tCtrl-O"));
- file->Append (ID_file_add_ov, _("&Add OV..."));
- file->Append (ID_file_add_kdm, _("&Add KDM..."));
+ _file_add_ov = file->Append (ID_file_add_ov, _("&Add OV..."));
+ _file_add_kdm = file->Append (ID_file_add_kdm, _("&Add KDM..."));
+ file->AppendSeparator ();
+ file->Append (ID_file_close, _("&Close"));
+ file->AppendSeparator ();
#ifdef __WXOSX__
file->Append (wxID_EXIT, _("&Exit"));
void file_open ()
{
- wxDirDialog* c = new wxDirDialog (
- this,
- _("Select DCP to open"),
- wxStandardPaths::Get().GetDocumentsDir(),
- wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST
- );
+ wxString d = wxStandardPaths::Get().GetDocumentsDir();
+ if (Config::instance()->last_player_load_directory()) {
+ d = std_to_wx (Config::instance()->last_player_load_directory()->string());
+ }
+
+ wxDirDialog* c = new wxDirDialog (this, _("Select DCP to open"), d, wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
int r;
while (true) {
}
if (r == wxID_OK) {
- load_dcp (wx_to_std (c->GetPath ()));
+ boost::filesystem::path const dcp (wx_to_std (c->GetPath ()));
+ load_dcp (dcp);
+ Config::instance()->set_last_player_load_directory (dcp.parent_path());
}
c->Destroy ();
}
if (r == wxID_OK) {
+ DCPOMATIC_ASSERT (_film);
shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
DCPOMATIC_ASSERT (dcp);
dcp->add_ov (wx_to_std(c->GetPath()));
wxFileDialog* d = new wxFileDialog (this, _("Select KDM"));
if (d->ShowModal() == wxID_OK) {
+ DCPOMATIC_ASSERT (_film);
shared_ptr<DCPContent> dcp = boost::dynamic_pointer_cast<DCPContent>(_film->content().front());
DCPOMATIC_ASSERT (dcp);
try {
dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
+ dcp->examine (shared_ptr<Job>());
} catch (exception& e) {
- error_dialog (this, wxString::Format (_("Could not load KDM (%s)"), e.what ()));
+ error_dialog (this, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what()));
d->Destroy ();
return;
}
-
- dcp->examine (shared_ptr<Job>());
}
d->Destroy ();
_info->triggered_update ();
}
+ void file_close ()
+ {
+ _viewer->set_film (shared_ptr<Film>());
+ _film.reset ();
+ _info->triggered_update ();
+ set_menu_sensitivity ();
+ }
+
void file_exit ()
{
Close ();
}
}
+ void set_menu_sensitivity ()
+ {
+ _file_add_ov->Enable (static_cast<bool>(_film));
+ _file_add_kdm->Enable (static_cast<bool>(_film));
+ }
+
bool _update_news_requested;
PlayerInformation* _info;
wxPreferencesEditor* _config_dialog;
FilmViewer* _viewer;
boost::shared_ptr<Film> _film;
boost::signals2::scoped_connection _config_changed_connection;
+ wxMenuItem* _file_add_ov;
+ wxMenuItem* _file_add_kdm;
};
static const wxCmdLineEntryDesc command_line_description[] = {
wxInitAllImageHandlers ();
Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+ Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
- wxSplashScreen* splash = 0;
- try {
- if (!Config::have_existing ("config.xml")) {
- wxBitmap bitmap;
- boost::filesystem::path p = shared_path () / "splash.png";
- if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
- splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
- wxYield ();
- }
- }
- } catch (boost::filesystem::filesystem_error& e) {
- /* Maybe we couldn't find the splash image; never mind */
- }
+ wxSplashScreen* splash = maybe_show_splash ();
SetAppName (_("DCP-o-matic Player"));
try {
_frame->load_dcp (_dcp_to_load);
} catch (exception& e) {
- error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1 (%2)")), _dcp_to_load, e.what())));
+ error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load DCP %1.")), _dcp_to_load)), std_to_wx(e.what()));
}
}
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 (Config::instance()->check_for_updates ()) {
UpdateChecker::instance()->run ();
}
}
catch (exception& e)
{
- error_dialog (0, wxString::Format ("DCP-o-matic Player could not start: %s", e.what ()));
+ error_dialog (0, _("DCP-o-matic Player could not start."), std_to_wx(e.what()));
return true;
}
signal_manager->ui_idle ();
}
- void check ()
+ void config_failed_to_load ()
{
- try {
- EncodeServerFinder::instance()->rethrow ();
- } catch (exception& e) {
- error_dialog (0, std_to_wx (e.what ()));
- }
+ message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
}
- void config_failed_to_load ()
+ void config_warning (string m)
{
- message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
+ message_dialog (_frame, std_to_wx (m));
}
DOMFrame* _frame;
- shared_ptr<wxTimer> _timer;
string _dcp_to_load;
};
projects / dcpomatic.git / blobdiff