/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "content_colour_conversion_dialog.h"
#include "content_widget.h"
#include "content_panel.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
#include "lib/filter.h"
#include "lib/ffmpeg_content.h"
#include "lib/colour_conversion.h"
#include "lib/video_content.h"
#include <wx/spinctrl.h>
#include <boost/foreach.hpp>
+#include <boost/unordered_set.hpp>
+#include <boost/functional/hash.hpp>
#include <set>
#include <iostream>
using boost::dynamic_pointer_cast;
using boost::bind;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
static VideoContentScale
index_to_scale (int n)
VideoPanel::VideoPanel (ContentPanel* p)
: ContentSubPanel (p, _("Video"))
{
- _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's video as OV and make VF"));
- _reference_note = new wxStaticText (this, wxID_ANY, wxT(""));
+ _reference = new CheckBox (this, _("Use this DCP's video as OV and make VF"));
+ _reference_note = new StaticText (this, wxT(""));
_reference_note->Wrap (200);
wxFont font = _reference_note->GetFont();
font.SetStyle(wxFONTSTYLE_ITALIC);
&caster<VideoFrameType, int>
);
- _left_crop_label = create_label (this, _("Left crop"), true);
+ _crop_label = create_label (this, _("Crop"), true);
+
+#ifdef __WXGTK3__
+ int const crop_width = 128;
+#else
+ int const crop_width = 56;
+#endif
+
+ _left_crop_label = create_label (this, _("Left"), true);
_left_crop = new ContentSpinCtrl<VideoContent> (
this,
- new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+ new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (crop_width, -1)),
VideoContentProperty::CROP,
&Content::video,
boost::mem_fn (&VideoContent::left_crop),
boost::mem_fn (&VideoContent::set_left_crop)
);
- _right_crop_label = create_label (this, _("Right crop"), true);
+ _right_crop_label = create_label (this, _("Right"), true);
_right_crop = new ContentSpinCtrl<VideoContent> (
this,
- new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+ new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (crop_width, -1)),
VideoContentProperty::CROP,
&Content::video,
boost::mem_fn (&VideoContent::right_crop),
boost::mem_fn (&VideoContent::set_right_crop)
);
- _top_crop_label = create_label (this, _("Top crop"), true);
+ _top_crop_label = create_label (this, _("Top"), true);
_top_crop = new ContentSpinCtrl<VideoContent> (
this,
- new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+ new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (crop_width, -1)),
VideoContentProperty::CROP,
&Content::video,
boost::mem_fn (&VideoContent::top_crop),
boost::mem_fn (&VideoContent::set_top_crop)
);
- _bottom_crop_label = create_label (this, _("Bottom crop"), true);
+ _bottom_crop_label = create_label (this, _("Bottom"), true);
_bottom_crop = new ContentSpinCtrl<VideoContent> (
this,
- new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+ new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (crop_width, -1)),
VideoContentProperty::CROP,
&Content::video,
boost::mem_fn (&VideoContent::bottom_crop),
size.SetHeight (-1);
_filters_label = create_label (this, _("Filters"), true);
- _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
- _filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
+ _filters = new StaticText (this, _("None"), wxDefaultPosition, size);
+ _filters_button = new Button (this, _("Edit..."));
_colour_conversion_label = create_label (this, _("Colour conversion"), true);
_colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size);
/// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
_colour_conversion->Append (S_("Colour|Custom"));
- _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
+ _edit_colour_conversion_button = new Button (this, _("Edit..."));
- _description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
+ _description = new StaticText (this, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
_description->SetFont(font);
_left_crop->wrapped()->SetRange (0, 4096);
wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
add_label_to_sizer (crop, _left_crop_label, true, wxGBPosition (cr, 0));
_left_crop->add (crop, wxGBPosition (cr, 1));
+#ifdef __WXGTK3__
+ ++cr;
+ add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 0));
+ _right_crop->add (crop, wxGBPosition (cr, 1));
+#else
add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 2));
_right_crop->add (crop, wxGBPosition (cr, 3));
+#endif
++cr;
add_label_to_sizer (crop, _top_crop_label, true, wxGBPosition (cr, 0));
_top_crop->add (crop, wxGBPosition (cr, 1));
+#ifdef __WXGTK3__
+ ++cr;
+ add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 0));
+ _bottom_crop->add (crop, wxGBPosition (cr, 1));
+#else
add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 2));
_bottom_crop->add (crop, wxGBPosition (cr, 3));
- _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4));
- r += 2;
+#endif
+ add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0));
+ _grid->Add (crop, wxGBPosition(r, 1));
+ ++r;
- _fade_in_label->Show (full);
- _fade_in->Show (full);
- _fade_out_label->Show (full);
- _fade_out->Show (full);
_scale_to_label->Show (full);
_scale->show (full);
_filters_label->Show (full);
_colour_conversion->Show (full);
_edit_colour_conversion_button->Show (full);
- if (full) {
- add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
- _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
- ++r;
+ add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
+ _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
+ ++r;
- add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
- _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
- ++r;
+ add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
+ _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
+ ++r;
+ if (full) {
add_label_to_sizer (_grid, _scale_to_label, true, wxGBPosition (r, 0));
_scale->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
++r;
}
}
+std::size_t
+hash_value (boost::optional<ColourConversion> const & c)
+{
+ boost::hash<string> hasher;
+ if (!c) {
+ return hasher ("none");
+ }
+ return hasher (c->identifier());
+}
+
+
void
VideoPanel::film_content_changed (int property)
{
property == VideoContentProperty::SCALE) {
setup_description ();
} else if (property == VideoContentProperty::COLOUR_CONVERSION) {
- if (vcs && vcs->video->colour_conversion ()) {
- optional<size_t> preset = vcs->video->colour_conversion().get().preset ();
- vector<PresetColourConversion> cc = PresetColourConversion::all ();
- if (preset) {
- checked_set (_colour_conversion, preset.get() + 1);
+ boost::unordered_set<optional<ColourConversion> > check;
+ BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+ check.insert (i->video->colour_conversion());
+ }
+
+ /* Remove any "Many" entry that we might have added previously. There should
+ * be entries for each preset plus one for "None" and one for "Custom".
+ */
+ vector<PresetColourConversion> cc = PresetColourConversion::all ();
+ if (_colour_conversion->GetCount() > cc.size() + 2) {
+ _colour_conversion->Delete (_colour_conversion->GetCount() - 1);
+ }
+
+ if (check.size() == 1) {
+ if (vcs && vcs->video->colour_conversion ()) {
+ optional<size_t> preset = vcs->video->colour_conversion().get().preset ();
+ if (preset) {
+ checked_set (_colour_conversion, preset.get() + 1);
+ } else {
+ checked_set (_colour_conversion, cc.size() + 1);
+ }
} else {
- checked_set (_colour_conversion, cc.size() + 1);
+ checked_set (_colour_conversion, 0);
}
- } else {
- checked_set (_colour_conversion, 0);
+ } else if (check.size() > 1) {
+ /* Add a "many" entry and select it as an indication that multiple different
+ * colour conversions are present in the selection.
+ */
+ _colour_conversion->Append (_("Many"));
+ checked_set (_colour_conversion, _colour_conversion->GetCount() - 1);
}
setup_sensitivity ();
if (check.size() == 1) {
_fade_in->set (
- ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()),
- vc.front()->active_video_frame_rate ()
+ ContentTime::from_frames (vc.front()->video->fade_in(), vc.front()->active_video_frame_rate(_parent->film())),
+ vc.front()->active_video_frame_rate(_parent->film())
);
} else {
_fade_in->clear ();
if (check.size() == 1) {
_fade_out->set (
- ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()),
- vc.front()->active_video_frame_rate ()
+ ContentTime::from_frames (vc.front()->video->fade_out(), vc.front()->active_video_frame_rate(_parent->film())),
+ vc.front()->active_video_frame_rate(_parent->film())
);
} else {
_fade_out->clear ();
return;
}
- string d = vc.front()->video->processing_description ();
+ string d = vc.front()->video->processing_description (_parent->film());
size_t lines = count (d.begin(), d.end(), '\n');
for (int i = lines; i < 6; ++i) {
VideoPanel::colour_conversion_changed ()
{
ContentList vc = _parent->selected_video ();
- if (vc.size() != 1) {
- return;
- }
int const s = _colour_conversion->GetSelection ();
vector<PresetColourConversion> all = PresetColourConversion::all ();
- if (s == 0) {
- vc.front()->video->unset_colour_conversion ();
- } else if (s == int (all.size() + 1)) {
+ if (s == int(all.size() + 1)) {
edit_colour_conversion_clicked ();
} else {
- vc.front()->video->set_colour_conversion (all[s - 1].conversion);
+ BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video()) {
+ if (s == 0) {
+ i->video->unset_colour_conversion ();
+ } else if (s != int(all.size() + 2)) {
+ i->video->set_colour_conversion (all[s - 1].conversion);
+ }
+ }
}
}
VideoPanel::edit_colour_conversion_clicked ()
{
ContentList vc = _parent->selected_video ();
- if (vc.size() != 1) {
- return;
- }
ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->video->yuv ());
d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front().conversion));
if (d->ShowModal() == wxID_OK) {
- vc.front()->video->set_colour_conversion (d->get ());
+ BOOST_FOREACH (shared_ptr<Content> i, vc) {
+ i->video->set_colour_conversion (d->get ());
+ }
} else {
/* Reset the colour conversion choice */
film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
}
string why_not;
- bool const can_reference = dcp && dcp->can_reference_video (why_not);
+ bool const can_reference = dcp && dcp->can_reference_video (_parent->film(), why_not);
setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
if (_reference->GetValue ()) {
_description->Enable (true);
_filters->Enable (true);
_filters_button->Enable (single && !ffmpeg_sel.empty ());
- _colour_conversion->Enable (single && !video_sel.empty ());
+ _colour_conversion->Enable (!video_sel.empty());
}
ContentList vc = _parent->selected_video ();
VideoPanel::fade_in_changed ()
{
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
- int const vfr = _parent->film()->video_frame_rate ();
- i->video->set_fade_in (_fade_in->get (vfr).frames_round (vfr));
+ double const vfr = i->active_video_frame_rate (_parent->film());
+ i->video->set_fade_in (_fade_in->get(vfr).frames_round(vfr));
}
}
VideoPanel::fade_out_changed ()
{
BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
- int const vfr = _parent->film()->video_frame_rate ();
- i->video->set_fade_out (_fade_out->get (vfr).frames_round (vfr));
+ double const vfr = i->active_video_frame_rate (_parent->film());
+ i->video->set_fade_out (_fade_out->get(vfr).frames_round(vfr));
}
}
projects / dcpomatic.git / blobdiff