/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "content_widget.h"
#include "content_panel.h"
#include <wx/spinctrl.h>
+#include <boost/foreach.hpp>
#include <set>
+#include <iostream>
using std::vector;
using std::string;
_frame_type->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
++r;
+ add_label_to_grid_bag_sizer (grid, this, _("Crop"), true, wxGBPosition (r, 0));
+
int cr = 0;
wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- add_label_to_grid_bag_sizer (crop, this, _("Left crop"), true, wxGBPosition (cr, 0));
+ add_label_to_grid_bag_sizer (crop, this, _("Left"), true, wxGBPosition (cr, 0));
_left_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
);
_left_crop->add (crop, wxGBPosition (cr, 1));
- add_label_to_grid_bag_sizer (crop, this, _("Right crop"), true, wxGBPosition (cr, 2));
+ add_label_to_grid_bag_sizer (crop, this, _("Right"), true, wxGBPosition (cr, 2));
_right_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
_right_crop->add (crop, wxGBPosition (cr, 3));
++cr;
-
- add_label_to_grid_bag_sizer (crop, this, _("Top crop"), true, wxGBPosition (cr, 0));
+
+ add_label_to_grid_bag_sizer (crop, this, _("Top"), true, wxGBPosition (cr, 0));
_top_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
);
_top_crop->add (crop, wxGBPosition (cr, 1));
- add_label_to_grid_bag_sizer (crop, this, _("Bottom crop"), true, wxGBPosition (cr, 2));
+ add_label_to_grid_bag_sizer (crop, this, _("Bottom"), true, wxGBPosition (cr, 2));
_bottom_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
);
_bottom_crop->add (crop, wxGBPosition (cr, 3));
- grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 3));
+ grid->Add (crop, wxGBPosition (r, 1), wxGBSpan (2, 3));
r += 2;
add_label_to_grid_bag_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0));
_fade_out = new Timecode<ContentTime> (this);
grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
++r;
-
+
add_label_to_grid_bag_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0));
_scale = new ContentChoice<VideoContent, VideoContentScale> (
this,
wxClientDC dc (this);
wxSize size = dc.GetTextExtent (wxT ("A quite long name"));
size.SetHeight (-1);
-
+
add_label_to_grid_bag_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0));
- _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
- grid->Add (_filters, wxGBPosition (r, 1), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
- _filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
- grid->Add (_filters_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ {
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+
+ _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
+ s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+ _filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
+ s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
+
+ grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ }
++r;
-
- _enable_colour_conversion = new wxCheckBox (this, wxID_ANY, _("Colour conversion"));
- grid->Add (_enable_colour_conversion, wxGBPosition (r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
- _colour_conversion = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
- grid->Add (_colour_conversion, wxGBPosition (r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- _colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
- grid->Add (_colour_conversion_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+
+ add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
+ {
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+
+ _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size);
+ _colour_conversion->Append (_("None"));
+ BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all()) {
+ _colour_conversion->Append (std_to_wx (i.name));
+ }
+ _colour_conversion->Append (_("Custom"));
+ s->Add (_colour_conversion, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+
+ _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
+ s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
+
+ grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ }
++r;
_description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
_right_crop->wrapped()->SetRange (0, 1024);
_bottom_crop->wrapped()->SetRange (0, 1024);
- vector<VideoContentScale> scales = VideoContentScale::all ();
_scale->wrapped()->Clear ();
- for (vector<VideoContentScale>::iterator i = scales.begin(); i != scales.end(); ++i) {
- _scale->wrapped()->Append (std_to_wx (i->name ()));
+ BOOST_FOREACH (VideoContentScale const & i, VideoContentScale::all ()) {
+ _scale->wrapped()->Append (std_to_wx (i.name ()));
}
_frame_type->wrapped()->Append (_("2D"));
_fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this));
_fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
-
- _filters_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_filters_clicked, this));
- _enable_colour_conversion->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&VideoPanel::enable_colour_conversion_clicked, this));
- _colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
+
+ _filters_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_filters_clicked, this));
+ _colour_conversion->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&VideoPanel::colour_conversion_changed, this));
+ _edit_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
}
void
vcs = vc.front ();
fcs = dynamic_pointer_cast<FFmpegContent> (vcs);
}
-
+
if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
setup_description ();
} else if (property == VideoContentProperty::VIDEO_CROP) {
setup_description ();
} else if (property == VideoContentProperty::COLOUR_CONVERSION) {
if (!vcs) {
- checked_set (_colour_conversion, wxT (""));
+ checked_set (_colour_conversion, 0);
+ _edit_colour_conversion_button->Enable (false);
} else if (vcs->colour_conversion ()) {
optional<size_t> preset = vcs->colour_conversion().get().preset ();
- vector<PresetColourConversion> cc = Config::instance()->colour_conversions ();
+ vector<PresetColourConversion> cc = PresetColourConversion::all ();
if (preset) {
- checked_set (_colour_conversion, std_to_wx (cc[preset.get()].name));
+ checked_set (_colour_conversion, preset.get() + 1);
+ _edit_colour_conversion_button->Enable (false);
} else {
- checked_set (_colour_conversion, _("Custom"));
+ checked_set (_colour_conversion, cc.size() + 1);
+ _edit_colour_conversion_button->Enable (true);
}
- _enable_colour_conversion->SetValue (true);
- _colour_conversion->Enable (true);
- _colour_conversion_button->Enable (true);
} else {
- checked_set (_colour_conversion, _("None"));
- _enable_colour_conversion->SetValue (false);
- _colour_conversion->Enable (false);
- _colour_conversion_button->Enable (false);
+ checked_set (_colour_conversion, 0);
+ _edit_colour_conversion_button->Enable (false);
}
} else if (property == FFmpegContentProperty::FILTERS) {
if (fcs) {
}
}
} else if (property == VideoContentProperty::VIDEO_FADE_IN) {
- set<ContentTime> check;
- for (VideoContentList::const_iterator i = vc.begin (); i != vc.end(); ++i) {
- check.insert ((*i)->fade_in ());
+ set<Frame> check;
+ BOOST_FOREACH (shared_ptr<const VideoContent> i, vc) {
+ check.insert (i->fade_in ());
}
-
+
if (check.size() == 1) {
- _fade_in->set (vc.front()->fade_in (), vc.front()->video_frame_rate ());
+ _fade_in->set (ContentTime::from_frames (vc.front()->fade_in (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ());
} else {
_fade_in->clear ();
}
} else if (property == VideoContentProperty::VIDEO_FADE_OUT) {
- set<ContentTime> check;
- for (VideoContentList::const_iterator i = vc.begin (); i != vc.end(); ++i) {
- check.insert ((*i)->fade_out ());
+ set<Frame> check;
+ BOOST_FOREACH (shared_ptr<const VideoContent> i, vc) {
+ check.insert (i->fade_out ());
}
-
+
if (check.size() == 1) {
- _fade_out->set (vc.front()->fade_out (), vc.front()->video_frame_rate ());
+ _fade_out->set (ContentTime::from_frames (vc.front()->fade_out (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ());
} else {
_fade_out->clear ();
}
}
void
-VideoPanel::edit_colour_conversion_clicked ()
+VideoPanel::colour_conversion_changed ()
{
VideoContentList vc = _parent->selected_video ();
if (vc.size() != 1) {
return;
}
- if (!vc.front()->colour_conversion ()) {
+ int const s = _colour_conversion->GetSelection ();
+ vector<PresetColourConversion> all = PresetColourConversion::all ();
+
+ if (s == 0) {
+ vc.front()->unset_colour_conversion ();
+ } else if (s == int (all.size() + 1)) {
+ edit_colour_conversion_clicked ();
+ } else {
+ vc.front()->set_colour_conversion (all[s - 1].conversion);
+ }
+}
+
+void
+VideoPanel::edit_colour_conversion_clicked ()
+{
+ VideoContentList vc = _parent->selected_video ();
+ if (vc.size() != 1) {
return;
}
- ColourConversion conversion = vc.front()->colour_conversion().get ();
ContentColourConversionDialog* d = new ContentColourConversionDialog (this);
- d->set (conversion);
+ d->set (vc.front()->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion));
d->ShowModal ();
-
vc.front()->set_colour_conversion (d->get ());
d->Destroy ();
}
{
VideoContentList video_sel = _parent->selected_video ();
FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg ();
-
+
bool const single = video_sel.size() == 1;
_frame_type->set_content (video_sel);
_fade_out->Enable (!video_sel.empty ());
_scale->set_content (video_sel);
+ _colour_conversion->Enable (single && !video_sel.empty ());
_filters_button->Enable (single && !ffmpeg_sel.empty ());
- _enable_colour_conversion->Enable (single);
- _colour_conversion_button->Enable (single);
film_content_changed (VideoContentProperty::VIDEO_CROP);
film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
void
VideoPanel::fade_in_changed ()
{
- VideoContentList vc = _parent->selected_video ();
- for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) {
- (*i)->set_fade_in (_fade_in->get (_parent->film()->video_frame_rate ()));
+ BOOST_FOREACH (shared_ptr<VideoContent> i, _parent->selected_video ()) {
+ int const vfr = _parent->film()->video_frame_rate ();
+ i->set_fade_in (_fade_in->get (vfr).frames_round (vfr));
}
}
void
VideoPanel::fade_out_changed ()
{
- VideoContentList vc = _parent->selected_video ();
- for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) {
- (*i)->set_fade_out (_fade_out->get (_parent->film()->video_frame_rate ()));
- }
-}
-
-void
-VideoPanel::enable_colour_conversion_clicked ()
-{
- VideoContentList vc = _parent->selected_video ();
- if (vc.size() != 1) {
- return;
- }
-
- if (_enable_colour_conversion->GetValue()) {
- vc.front()->set_default_colour_conversion ();
- } else {
- vc.front()->unset_colour_conversion ();
+ BOOST_FOREACH (shared_ptr<VideoContent> i, _parent->selected_video ()) {
+ int const vfr = _parent->film()->video_frame_rate ();
+ i->set_fade_out (_fade_out->get (vfr).frames_round (vfr));
}
}
projects / dcpomatic.git / blobdiff