projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate readable error from technical detail in some places.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_player.cc
diff --git
a/src/tools/dcpomatic_player.cc
b/src/tools/dcpomatic_player.cc
index f6f329c42e0fa41cc487441de6f1b21624b673b3..a75f6b9f40d2422fde57527920c1e50f37cf4872 100644
(file)
--- a/
src/tools/dcpomatic_player.cc
+++ b/
src/tools/dcpomatic_player.cc
@@
-289,13
+289,12
@@
private:
DCPOMATIC_ASSERT (dcp);
try {
dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
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) {
} catch (exception& e) {
- error_dialog (this, wxString::Format (_("Could not load KDM
(%s)"), std_to_wx(e.what()
)));
+ error_dialog (this, wxString::Format (_("Could not load KDM
.")), std_to_wx(e.what(
)));
d->Destroy ();
return;
}
d->Destroy ();
return;
}
-
- dcp->examine (shared_ptr<Job>());
}
d->Destroy ();
}
d->Destroy ();
@@
-483,7
+482,7
@@
private:
try {
_frame->load_dcp (_dcp_to_load);
} catch (exception& e) {
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(
)));
}
}
}
}
@@
-497,7
+496,7
@@
private:
}
catch (exception& e)
{
}
catch (exception& e)
{
- error_dialog (0,
wxString::Format ("DCP-o-matic Player could not start: %s", std_to_wx(e.what()
)));
+ error_dialog (0,
_("DCP-o-matic Player could not start."), std_to_wx(e.what(
)));
return true;
}
return true;
}