From 04ef57589ebb7c0de3377172a03b24698fd2364a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Mar 2014 14:24:08 +0000 Subject: Tentative support for 3D from alternate frames. Also remove references to libpostproc. Requested-by: Jean-Jacques Mantello --- src/wx/timing_panel.cc | 6 +++++- src/wx/video_panel.cc | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/wx') diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 34702463c..2321fd0df 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -87,7 +87,11 @@ TimingPanel::film_content_changed (int property) } else { _position->set (0, 24); } - } else if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_RATE) { + } else if ( + property == ContentProperty::LENGTH || + property == VideoContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::VIDEO_FRAME_TYPE + ) { if (content) { _full_length->set (content->full_length (), _editor->film()->video_frame_rate ()); _play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ()); diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 38604248c..56848907b 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -196,6 +196,7 @@ VideoPanel::VideoPanel (FilmEditor* e) _frame_type->wrapped()->Append (_("2D")); _frame_type->wrapped()->Append (_("3D left/right")); _frame_type->wrapped()->Append (_("3D top/bottom")); + _frame_type->wrapped()->Append (_("3D alternate")); _filters_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_filters_clicked, this)); _colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this)); -- cgit v1.2.3 From ae27e065d49a5d2476913f677745dd7e4a31cc09 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Mar 2014 15:19:13 +0000 Subject: Fix bad rounding of timecodes for display. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Gérald Maruccia --- ChangeLog | 2 ++ src/wx/timecode.cc | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'src/wx') diff --git a/ChangeLog b/ChangeLog index 45847805a..f4830e40d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-18 Carl Hetherington + * Fix bad rounding of timecodes. + * Tentative support for 3D from alternate frames of the source. 2014-03-17 Carl Hetherington diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc index ac4fd46c4..a8c90b488 100644 --- a/src/wx/timecode.cc +++ b/src/wx/timecode.cc @@ -85,20 +85,24 @@ Timecode::Timecode (wxWindow* parent) void Timecode::set (Time t, int fps) { - int const h = t / (3600 * TIME_HZ); - t -= h * 3600 * TIME_HZ; - int const m = t / (60 * TIME_HZ); - t -= m * 60 * TIME_HZ; - int const s = t / TIME_HZ; - t -= s * TIME_HZ; - int const f = divide_with_round (t * fps, TIME_HZ); + /* Do this calculation with frames so that we can round + to a frame boundary at the start rather than the end. + */ + int64_t f = divide_with_round (t * fps, TIME_HZ); + + int const h = f / (3600 * fps); + f -= h * 3600 * fps; + int const m = f / (60 * fps); + f -= m * 60 * fps; + int const s = f / fps; + f -= s * fps; checked_set (_hours, lexical_cast (h)); checked_set (_minutes, lexical_cast (m)); checked_set (_seconds, lexical_cast (s)); checked_set (_frames, lexical_cast (f)); - _fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02d", h, m, s, f)); + _fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02ld", h, m, s, f)); } Time -- cgit v1.2.3 From 8da5022c2a32accfc70a4f66a84e5158dcbe467f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 19 Mar 2014 23:09:38 +0000 Subject: I think this is a correction of a supporter name. --- src/wx/about_dialog.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/wx') diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 01332dfcc..812772f10 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -115,7 +115,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Adam Colt")); supported_by.Add (wxT ("Andres Fink")); supported_by.Add (wxT ("Evan Freeze")); - supported_by.Add (wxT ("Rodolfo Giuliano")); + supported_by.Add (wxT ("Silvio Giuliano")); supported_by.Add (wxT ("Flor Guillaume")); supported_by.Add (wxT ("Jonathan Jensen")); supported_by.Add (wxT ("Adam Klotblixt")); -- cgit v1.2.3