#include "lib/config.h"
#include "lib/util.h"
#include "lib/ratio.h"
+#include "lib/frame_rate_change.h"
#include "filter_dialog.h"
#include "video_panel.h"
#include "wx_util.h"
_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"));
+ _frame_type->wrapped()->Append (_("3D left only"));
+ _frame_type->wrapped()->Append (_("3D right only"));
_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));
_colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
} else if (property == FFmpegContentProperty::FILTERS) {
if (fcs) {
- pair<string, string> p = Filter::ffmpeg_strings (fcs->filters ());
- if (p.first.empty () && p.second.empty ()) {
+ string const p = Filter::ffmpeg_string (fcs->filters ());
+ if (p.empty ()) {
_filters->SetLabel (_("None"));
} else {
- string const b = p.first + " " + p.second;
- _filters->SetLabel (std_to_wx (b));
+ _filters->SetLabel (std_to_wx (p));
}
}
}
d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
++lines;
- FrameRateConversion frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
- d << std_to_wx (frc.description) << "\n";
+ FrameRateChange frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
+ d << std_to_wx (frc.description ()) << "\n";
++lines;
for (int i = lines; i < 6; ++i) {