diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-24 23:27:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-24 23:27:09 +0100 |
| commit | 595f564a52d69d0401f5622c7d81cacda679005c (patch) | |
| tree | 6e993fdab993194e9c9d2fc47960caf9c5437d97 /src/wx | |
| parent | 4c6e64ed9792fa15acba4255f02e2132d4ed4ea5 (diff) | |
Fix video information with 3D.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_editor.cc | 4 | ||||
| -rw-r--r-- | src/wx/video_panel.cc | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 5839244a4..cb14f70e7 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -531,9 +531,9 @@ FilmEditor::set_film (shared_ptr<Film> f) if (!_film->content().empty ()) { set_selection (_film->content().front ()); - } else { - content_selection_changed (); } + + content_selection_changed (); } void diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index f5306e67f..edf4505c9 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -183,6 +183,7 @@ VideoPanel::film_content_changed (shared_ptr<Content> c, int property) if (property == VideoContentProperty::VIDEO_FRAME_TYPE) { checked_set (_frame_type, vc ? vc->video_frame_type () : VIDEO_FRAME_TYPE_2D); + setup_description (); } else if (property == VideoContentProperty::VIDEO_CROP) { checked_set (_left_crop, vc ? vc->crop().left : 0); checked_set (_right_crop, vc ? vc->crop().right : 0); @@ -259,15 +260,15 @@ VideoPanel::setup_description () if (vc->video_size().width && vc->video_size().height) { d << wxString::Format ( _("Content video is %dx%d (%.2f:1)\n"), - vc->video_size().width, vc->video_size().height, - float (vc->video_size().width) / vc->video_size().height + vc->video_size_after_3d_split().width, vc->video_size_after_3d_split().height, + float (vc->video_size_after_3d_split().width) / vc->video_size_after_3d_split().height ); ++lines; } Crop const crop = vc->crop (); if ((crop.left || crop.right || crop.top || crop.bottom) && vc->video_size() != libdcp::Size (0, 0)) { - libdcp::Size cropped = vc->video_size (); + libdcp::Size cropped = vc->video_size_after_3d_split (); cropped.width -= crop.left + crop.right; cropped.height -= crop.top + crop.bottom; d << wxString::Format ( |