/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lib/ratio.h"
#include "lib/frame_rate_change.h"
#include "lib/dcp_content.h"
+#include "lib/video_content.h"
#include <wx/spinctrl.h>
#include <boost/foreach.hpp>
#include <set>
_frame_type = new ContentChoice<VideoContent, VideoFrameType> (
this,
new wxChoice (this, wxID_ANY),
- VideoContentProperty::VIDEO_FRAME_TYPE,
- boost::mem_fn (&VideoContent::video_frame_type),
- boost::mem_fn (&VideoContent::set_video_frame_type),
+ VideoContentProperty::FRAME_TYPE,
+ &Content::video,
+ boost::mem_fn (&VideoContent::frame_type),
+ boost::mem_fn (&VideoContent::set_frame_type),
&caster<int, VideoFrameType>,
&caster<VideoFrameType, int>
);
_left_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
- VideoContentProperty::VIDEO_CROP,
+ VideoContentProperty::CROP,
+ &Content::video,
boost::mem_fn (&VideoContent::left_crop),
boost::mem_fn (&VideoContent::set_left_crop)
);
_right_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
- VideoContentProperty::VIDEO_CROP,
+ VideoContentProperty::CROP,
+ &Content::video,
boost::mem_fn (&VideoContent::right_crop),
boost::mem_fn (&VideoContent::set_right_crop)
);
_top_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
- VideoContentProperty::VIDEO_CROP,
+ VideoContentProperty::CROP,
+ &Content::video,
boost::mem_fn (&VideoContent::top_crop),
boost::mem_fn (&VideoContent::set_top_crop)
);
_bottom_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
- VideoContentProperty::VIDEO_CROP,
+ VideoContentProperty::CROP,
+ &Content::video,
boost::mem_fn (&VideoContent::bottom_crop),
boost::mem_fn (&VideoContent::set_bottom_crop)
);
_scale = new ContentChoice<VideoContent, VideoContentScale> (
this,
new wxChoice (this, wxID_ANY),
- VideoContentProperty::VIDEO_SCALE,
+ VideoContentProperty::SCALE,
+ &Content::video,
boost::mem_fn (&VideoContent::scale),
boost::mem_fn (&VideoContent::set_scale),
&index_to_scale,
BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all()) {
_colour_conversion->Append (std_to_wx (i.name));
}
+
+ /// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
_colour_conversion->Append (S_("Colour|Custom"));
s->Add (_colour_conversion, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
}
_frame_type->wrapped()->Append (_("2D"));
+ _frame_type->wrapped()->Append (_("3D"));
_frame_type->wrapped()->Append (_("3D left/right"));
_frame_type->wrapped()->Append (_("3D top/bottom"));
_frame_type->wrapped()->Append (_("3D alternate"));
_fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this));
_fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
- _reference->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&VideoPanel::reference_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));
+ _reference->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this));
+ _filters_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_filters_clicked, this));
+ _colour_conversion->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::colour_conversion_changed, this));
+ _edit_colour_conversion_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
}
void
VideoPanel::film_changed (Film::Property property)
{
switch (property) {
- case Film::CONTAINER:
case Film::VIDEO_FRAME_RATE:
+ case Film::CONTAINER:
+ setup_description ();
+ setup_sensitivity ();
+ break;
case Film::RESOLUTION:
setup_description ();
break;
case Film::REEL_TYPE:
+ case Film::INTEROP:
setup_sensitivity ();
+ break;
default:
break;
}
void
VideoPanel::film_content_changed (int property)
{
- VideoContentList vc = _parent->selected_video ();
- shared_ptr<VideoContent> vcs;
+ ContentList vc = _parent->selected_video ();
+ shared_ptr<Content> vcs;
shared_ptr<FFmpegContent> fcs;
if (!vc.empty ()) {
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::VIDEO_SCALE) {
- setup_description ();
- } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
+ if (property == ContentProperty::VIDEO_FRAME_RATE ||
+ property == VideoContentProperty::FRAME_TYPE ||
+ property == VideoContentProperty::CROP ||
+ property == VideoContentProperty::SCALE) {
setup_description ();
} else if (property == VideoContentProperty::COLOUR_CONVERSION) {
- if (vcs && vcs->colour_conversion ()) {
- optional<size_t> preset = vcs->colour_conversion().get().preset ();
+ 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);
checked_set (_filters, p);
}
}
- } else if (property == VideoContentProperty::VIDEO_FADE_IN) {
+ } else if (property == VideoContentProperty::FADE_IN) {
set<Frame> check;
- BOOST_FOREACH (shared_ptr<const VideoContent> i, vc) {
- check.insert (i->fade_in ());
+ BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+ check.insert (i->video->fade_in ());
}
if (check.size() == 1) {
- _fade_in->set (ContentTime::from_frames (vc.front()->fade_in (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ());
+ _fade_in->set (
+ ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()),
+ vc.front()->active_video_frame_rate ()
+ );
} else {
_fade_in->clear ();
}
- } else if (property == VideoContentProperty::VIDEO_FADE_OUT) {
+ } else if (property == VideoContentProperty::FADE_OUT) {
set<Frame> check;
- BOOST_FOREACH (shared_ptr<const VideoContent> i, vc) {
- check.insert (i->fade_out ());
+ BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+ check.insert (i->video->fade_out ());
}
if (check.size() == 1) {
- _fade_out->set (ContentTime::from_frames (vc.front()->fade_out (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ());
+ _fade_out->set (
+ ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()),
+ vc.front()->active_video_frame_rate ()
+ );
} else {
_fade_out->clear ();
}
void
VideoPanel::setup_description ()
{
- VideoContentList vc = _parent->selected_video ();
+ ContentList vc = _parent->selected_video ();
if (vc.empty ()) {
checked_set (_description, wxT (""));
return;
return;
}
- string d = vc.front()->processing_description ();
+ string d = vc.front()->video->processing_description ();
size_t lines = count (d.begin(), d.end(), '\n');
for (int i = lines; i < 6; ++i) {
void
VideoPanel::colour_conversion_changed ()
{
- VideoContentList vc = _parent->selected_video ();
+ ContentList vc = _parent->selected_video ();
if (vc.size() != 1) {
return;
}
vector<PresetColourConversion> all = PresetColourConversion::all ();
if (s == 0) {
- vc.front()->unset_colour_conversion ();
+ vc.front()->video->unset_colour_conversion ();
} else if (s == int (all.size() + 1)) {
edit_colour_conversion_clicked ();
} else {
- vc.front()->set_colour_conversion (all[s - 1].conversion);
+ vc.front()->video->set_colour_conversion (all[s - 1].conversion);
}
}
void
VideoPanel::edit_colour_conversion_clicked ()
{
- VideoContentList vc = _parent->selected_video ();
+ ContentList vc = _parent->selected_video ();
if (vc.size() != 1) {
return;
}
- ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->yuv ());
- d->set (vc.front()->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion));
- d->ShowModal ();
- vc.front()->set_colour_conversion (d->get ());
+ 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 ());
+ } else {
+ /* Reset the colour conversion choice */
+ film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
+ }
d->Destroy ();
}
void
VideoPanel::content_selection_changed ()
{
- VideoContentList video_sel = _parent->selected_video ();
+ ContentList video_sel = _parent->selected_video ();
_frame_type->set_content (video_sel);
_left_crop->set_content (video_sel);
_bottom_crop->set_content (video_sel);
_scale->set_content (video_sel);
- film_content_changed (VideoContentProperty::VIDEO_CROP);
- film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+ film_content_changed (ContentProperty::VIDEO_FRAME_RATE);
+ film_content_changed (VideoContentProperty::CROP);
film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
- film_content_changed (VideoContentProperty::VIDEO_FADE_IN);
- film_content_changed (VideoContentProperty::VIDEO_FADE_OUT);
+ film_content_changed (VideoContentProperty::FADE_IN);
+ film_content_changed (VideoContentProperty::FADE_OUT);
film_content_changed (FFmpegContentProperty::FILTERS);
film_content_changed (DCPContentProperty::REFERENCE_VIDEO);
_filters_button->Enable (false);
_colour_conversion->Enable (false);
} else {
- VideoContentList video_sel = _parent->selected_video ();
+ ContentList video_sel = _parent->selected_video ();
FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg ();
bool const single = video_sel.size() == 1;
_colour_conversion->Enable (single && !video_sel.empty ());
}
- VideoContentList vc = _parent->selected_video ();
- shared_ptr<VideoContent> vcs;
+ ContentList vc = _parent->selected_video ();
+ shared_ptr<Content> vcs;
if (!vc.empty ()) {
vcs = vc.front ();
}
- if (vcs && vcs->colour_conversion ()) {
- _edit_colour_conversion_button->Enable (!vcs->colour_conversion().get().preset());
+ if (vcs && vcs->video->colour_conversion ()) {
+ _edit_colour_conversion_button->Enable (!vcs->video->colour_conversion().get().preset());
} else {
_edit_colour_conversion_button->Enable (false);
}
void
VideoPanel::fade_in_changed ()
{
- BOOST_FOREACH (shared_ptr<VideoContent> i, _parent->selected_video ()) {
+ BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
int const vfr = _parent->film()->video_frame_rate ();
- i->set_fade_in (_fade_in->get (vfr).frames_round (vfr));
+ i->video->set_fade_in (_fade_in->get (vfr).frames_round (vfr));
}
}
void
VideoPanel::fade_out_changed ()
{
- BOOST_FOREACH (shared_ptr<VideoContent> i, _parent->selected_video ()) {
+ BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
int const vfr = _parent->film()->video_frame_rate ();
- i->set_fade_out (_fade_out->get (vfr).frames_round (vfr));
+ i->video->set_fade_out (_fade_out->get (vfr).frames_round (vfr));
}
}
projects / dcpomatic.git / blobdiff