projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
25c7dba
)
Try again to fix Windows wxWidgets complain using compose to save all the mucking...
author
Carl Hetherington
<cth@carlh.net>
Sun, 31 Dec 2017 02:03:02 +0000
(
02:03
+0000)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 31 Dec 2017 02:03:02 +0000
(
02:03
+0000)
src/wx/player_information.cc
patch
|
blob
|
history
diff --git
a/src/wx/player_information.cc
b/src/wx/player_information.cc
index 6d091630a4bb91bf0a25bf85bdbed6c2f7bac9d5..2139d830dae77b6bd15662c09373d806dbbd1d48 100644
(file)
--- a/
src/wx/player_information.cc
+++ b/
src/wx/player_information.cc
@@
-22,10
+22,12
@@
#include "wx_util.h"
#include "film_viewer.h"
#include "lib/playlist.h"
#include "wx_util.h"
#include "film_viewer.h"
#include "lib/playlist.h"
+#include "lib/compose.hpp"
#include "lib/video_content.h"
#include "lib/dcp_content.h"
using std::cout;
#include "lib/video_content.h"
#include "lib/dcp_content.h"
using std::cout;
+using std::string;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
@@
-114,15
+116,15
@@
PlayerInformation::triggered_update ()
optional<double> vfr;
vfr = dcp->video_frame_rate ();
DCPOMATIC_ASSERT (vfr);
optional<double> vfr;
vfr = dcp->video_frame_rate ();
DCPOMATIC_ASSERT (vfr);
- checked_set (
- _dcp[r++],
- wxString::Format(
- _("Length: %s (%" wxLongLongFmtSpec " frames)"),
- std_to_wx(time_to_hmsf(dcp->full_length(), lrint(*vfr))).data(),
- dcp->full_length().frames_round(*vfr)
- )
+
+ string const len = String::compose(
+ wx_to_std(_("Length: %1 (%2 frames)")),
+ time_to_hmsf(dcp->full_length(), lrint(*vfr)),
+ dcp->full_length().frames_round(*vfr)
);
);
+ checked_set (_dcp[r++], std_to_wx(len));
+
dcp::Size decode = dcp->video->size();
optional<int> reduction = _viewer->dcp_decode_reduction();
if (reduction) {
dcp::Size decode = dcp->video->size();
optional<int> reduction = _viewer->dcp_decode_reduction();
if (reduction) {