diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-18 14:24:08 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-18 14:24:08 +0000 |
| commit | 04ef57589ebb7c0de3377172a03b24698fd2364a (patch) | |
| tree | e6afb1b0d1d20e15804033929ddd6ab1b19d2d41 /src/wx | |
| parent | 02e2271a16804a35698f513f536a9ab1893b8612 (diff) | |
Tentative support for 3D from alternate frames.
Also remove references to libpostproc.
Requested-by: Jean-Jacques Mantello
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/timing_panel.cc | 6 | ||||
| -rw-r--r-- | src/wx/video_panel.cc | 1 |
2 files changed, 6 insertions, 1 deletions
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)); |