From 9c260edf726e0118741c9115b59c7903b25e4a1f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Nov 2014 09:35:40 +0000 Subject: Fix initial setup of audio mapping control. --- src/wx/content_panel.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 23b531b47..53ed98799 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -339,6 +339,7 @@ ContentPanel::set_film (shared_ptr f) _film = f; film_changed (Film::CONTENT); + film_changed (Film::AUDIO_CHANNELS); selection_changed (); } -- cgit v1.2.3 From 1d45262d8e0e77b6f9c874c11858cbbd530c5dc5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Nov 2014 09:44:20 +0000 Subject: Shrink progress text so that it fits better on 4:3 screens. --- src/lib/transcode_job.cc | 3 ++- src/lib/util.cc | 30 ++++++++++-------------------- 2 files changed, 12 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 23a46d06d..c71028794 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -95,7 +95,8 @@ TranscodeJob::status () const s << Job::status (); if (!finished () && !_transcoder->finishing ()) { - s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second"); + /* TRANSLATORS: fps here is an abbreviation for frames per second */ + s << "; " << fixed << setprecision (1) << fps << " " << _("fps"); } return s.str (); diff --git a/src/lib/util.cc b/src/lib/util.cc index 7a0f1a17a..728e7d048 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -156,14 +156,11 @@ seconds_to_approximate_hms (int s) if (hours) { if (m > 30 && !minutes) { - ap << (h + 1) << N_(" ") << _("hours"); + /* TRANSLATORS: h here is an abbreviation for hours */ + ap << (h + 1) << _("h"); } else { - ap << h << N_(" "); - if (h == 1) { - ap << _("hour"); - } else { - ap << _("hours"); - } + /* TRANSLATORS: h here is an abbreviation for hours */ + ap << h << _("h"); } if (minutes | seconds) { @@ -174,14 +171,11 @@ seconds_to_approximate_hms (int s) if (minutes) { /* Minutes */ if (s > 30 && !seconds) { - ap << (m + 1) << N_(" ") << _("minutes"); + /* TRANSLATORS: m here is an abbreviation for minutes */ + ap << (m + 1) << _("m"); } else { - ap << m << N_(" "); - if (m == 1) { - ap << _("minute"); - } else { - ap << _("minutes"); - } + /* TRANSLATORS: m here is an abbreviation for minutes */ + ap << m << _("m"); } if (seconds) { @@ -191,12 +185,8 @@ seconds_to_approximate_hms (int s) if (seconds) { /* Seconds */ - ap << s << N_(" "); - if (s == 1) { - ap << _("second"); - } else { - ap << _("seconds"); - } + /* TRANSLATORS: s here is an abbreviation for seconds */ + ap << s << _("s"); } return ap.str (); -- cgit v1.2.3 From 330903522f2454744f2c45ae2fd255d120b2a102 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Nov 2014 09:50:43 +0000 Subject: Add a hint if there is 3D content and the DCP is 2D. --- ChangeLog | 4 ++++ src/wx/hints_dialog.cc | 14 ++++++++++++++ 2 files changed, 18 insertions(+) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 96307028b..47aea47cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-11-07 c.hetherington + + * Add a hint if there is 3D content in a proposed 2D DCP. + 2014-11-06 Carl Hetherington * Basic support for emailing a report of diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc index 497d138ca..a5f3417a2 100644 --- a/src/wx/hints_dialog.cc +++ b/src/wx/hints_dialog.cc @@ -133,6 +133,20 @@ HintsDialog::film_changed () _text->Newline (); } + int three_d = 0; + for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) { + shared_ptr vc = dynamic_pointer_cast (*i); + if (vc && vc->video_frame_type() != VIDEO_FRAME_TYPE_2D) { + ++three_d; + } + } + + if (three_d > 0) { + hint = true; + _text->WriteText (_("You are using 3D content but your DCP is set to 2D. Set the DCP to 3D if you want to play it back on a 3D system (e.g.\ Real-D, MasterImage etc.)")); + _text->Newline (); + } + _text->EndSymbolBullet (); if (!hint) { -- cgit v1.2.3