}
++r;
+ add_label_to_grid_bag_sizer (grid, _dcp_panel, _("DCP audio channels"), true, wxGBPosition (r, 0));
+ _dcp_audio_channels = new wxSpinCtrl (_dcp_panel, wxID_ANY);
+ grid->Add (_dcp_audio_channels, wxGBPosition (r, 1));
+ ++r;
+
{
add_label_to_grid_bag_sizer (grid, _dcp_panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0));
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_dcp_frame_rate->Append (std_to_wx (boost::lexical_cast<string> (*i)));
}
+ _dcp_audio_channels->SetRange (0, MAX_AUDIO_CHANNELS);
_j2k_bandwidth->SetRange (50, 250);
}
_dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
_dcp_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
_best_dcp_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
+ _dcp_audio_channels->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_audio_channels_changed), 0, this);
_with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
_subtitle_offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
_subtitle_scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
- _colour_lut->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::colour_lut_changed), 0, this);
_j2k_bandwidth->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
_audio_gain->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
_audio_gain_calculate_button->Connect (
}
++r;
- add_label_to_grid_bag_sizer (grid, _video_panel, _("Colour look-up table"), true, wxGBPosition (r, 0));
- _colour_lut = new wxChoice (_video_panel, wxID_ANY);
- for (int i = 0; i < 2; ++i) {
- _colour_lut->Append (std_to_wx (colour_lut_index_to_name (i)));
- }
- _colour_lut->SetSelection (0);
- grid->Add (_colour_lut, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
- ++r;
-
_left_crop->SetRange (0, 1024);
_top_crop->SetRange (0, 1024);
_right_crop->SetRange (0, 1024);
add_label_to_sizer (grid, _audio_panel, _("Audio Stream"), true);
_audio_stream = new wxChoice (_audio_panel, wxID_ANY);
- grid->Add (_audio_stream, 1);
+ grid->Add (_audio_stream, 1, wxEXPAND);
_audio_description = new wxStaticText (_audio_panel, wxID_ANY, wxT (""));
grid->AddSpacer (0);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_subtitle_offset = new wxSpinCtrl (_subtitle_panel);
s->Add (_subtitle_offset);
- add_label_to_sizer (s, _subtitle_panel, _("pixels"), false);
+ add_label_to_sizer (s, _subtitle_panel, _("%"), false);
grid->Add (s);
}
add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Stream"), true);
_subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY);
- grid->Add (_subtitle_stream, 1, wxEXPAND | wxALL, 6);
- grid->AddSpacer (0);
+ grid->Add (_subtitle_stream, 1, wxEXPAND);
- _subtitle_offset->SetRange (-1024, 1024);
+ _subtitle_offset->SetRange (-100, 100);
_subtitle_scale->SetRange (1, 1000);
+ _subtitle_scale->SetValue (100);
}
void
void
FilmEditor::subtitle_offset_changed (wxCommandEvent &)
{
- if (!_film) {
+ shared_ptr<SubtitleContent> c = selected_subtitle_content ();
+ if (!c) {
return;
}
- _film->set_subtitle_offset (_subtitle_offset->GetValue ());
+ c->set_subtitle_offset (_subtitle_offset->GetValue() / 100.0);
}
void
FilmEditor::subtitle_scale_changed (wxCommandEvent &)
{
- if (!_film) {
+ shared_ptr<SubtitleContent> c = selected_subtitle_content ();
+ if (!c) {
return;
}
- _film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0);
-}
-
-void
-FilmEditor::colour_lut_changed (wxCommandEvent &)
-{
- if (!_film) {
- return;
- }
-
- _film->set_colour_lut (_colour_lut->GetSelection ());
+ c->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0);
}
void
);
}
+void
+FilmEditor::dcp_audio_channels_changed (wxCommandEvent &)
+{
+ if (!_film) {
+ return;
+ }
+
+ _film->set_dcp_audio_channels (_dcp_audio_channels->GetValue ());
+}
+
/** Called when the metadata stored in the Film object has changed;
* so that we can update the GUI.
setup_subtitle_control_sensitivity ();
setup_dcp_name ();
break;
- case Film::SUBTITLE_OFFSET:
- checked_set (_subtitle_offset, _film->subtitle_offset ());
- break;
- case Film::SUBTITLE_SCALE:
- checked_set (_subtitle_scale, _film->subtitle_scale() * 100);
- break;
- case Film::COLOUR_LUT:
- checked_set (_colour_lut, _film->colour_lut ());
- break;
case Film::J2K_BANDWIDTH:
checked_set (_j2k_bandwidth, double (_film->j2k_bandwidth()) / 1e6);
break;
_best_dcp_frame_rate->Enable (_film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ());
break;
}
+ case Film::DCP_AUDIO_CHANNELS:
+ _dcp_audio_channels->SetValue (_film->dcp_audio_channels ());
+ _audio_mapping->set_channels (_film->dcp_audio_channels ());
+ break;
+ }
}
void
shared_ptr<Content> content = weak_content.lock ();
shared_ptr<VideoContent> video_content;
shared_ptr<AudioContent> audio_content;
+ shared_ptr<SubtitleContent> subtitle_content;
shared_ptr<FFmpegContent> ffmpeg_content;
if (content) {
video_content = dynamic_pointer_cast<VideoContent> (content);
audio_content = dynamic_pointer_cast<AudioContent> (content);
+ subtitle_content = dynamic_pointer_cast<SubtitleContent> (content);
ffmpeg_content = dynamic_pointer_cast<FFmpegContent> (content);
}
_length->set (0, 24);
}
} else if (property == VideoContentProperty::VIDEO_CROP) {
- checked_set (_left_crop, video_content ? video_content->crop().left : 0);
- checked_set (_right_crop, video_content ? video_content->crop().right : 0);
- checked_set (_top_crop, video_content ? video_content->crop().top : 0);
+ checked_set (_left_crop, video_content ? video_content->crop().left : 0);
+ checked_set (_right_crop, video_content ? video_content->crop().right : 0);
+ checked_set (_top_crop, video_content ? video_content->crop().top : 0);
checked_set (_bottom_crop, video_content ? video_content->crop().bottom : 0);
setup_scaling_description ();
} else if (property == VideoContentProperty::VIDEO_RATIO) {
} else {
checked_set (_ratio, -1);
}
+ setup_scaling_description ();
} else if (property == AudioContentProperty::AUDIO_GAIN) {
checked_set (_audio_gain, audio_content ? audio_content->audio_gain() : 0);
} else if (property == AudioContentProperty::AUDIO_DELAY) {
}
_dcp_sizer->Layout ();
}
+ } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET) {
+ checked_set (_subtitle_offset, subtitle_content ? (subtitle_content->subtitle_offset() * 100) : 0);
+ } else if (property == SubtitleContentProperty::SUBTITLE_SCALE) {
+ checked_set (_subtitle_scale, subtitle_content ? (subtitle_content->subtitle_scale() * 100) : 100);
}
}
film_changed (Film::CONTAINER);
film_changed (Film::SCALER);
film_changed (Film::WITH_SUBTITLES);
- film_changed (Film::SUBTITLE_OFFSET);
- film_changed (Film::SUBTITLE_SCALE);
- film_changed (Film::COLOUR_LUT);
film_changed (Film::J2K_BANDWIDTH);
film_changed (Film::DCI_METADATA);
film_changed (Film::DCP_VIDEO_FRAME_RATE);
+ film_changed (Film::DCP_AUDIO_CHANNELS);
+
+ if (!_film->content().empty ()) {
+ set_selection (_film->content().front ());
+ }
wxListEvent ev;
content_selection_changed (ev);
_filters_button->Enable (s);
_scaler->Enable (s);
_dcp_content_type->Enable (s);
- _best_dcp_frame_rate->Enable (s);
_dcp_frame_rate->Enable (s);
- _colour_lut->Enable (s);
+ _dcp_audio_channels->Enable (s);
_j2k_bandwidth->Enable (s);
_audio_gain->Enable (s);
_audio_gain_calculate_button->Enable (s);
setup_subtitle_control_sensitivity ();
setup_show_audio_sensitivity ();
setup_content_sensitivity ();
+ _best_dcp_frame_rate->Enable (s && _film && _film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ());
}
/** Called when the `Edit filters' button has been clicked */
if (c) {
_film->remove_content (c);
}
+
+ wxListEvent ev;
+ content_selection_changed (ev);
}
void
if (_audio_dialog && s && dynamic_pointer_cast<AudioContent> (s)) {
_audio_dialog->set_content (dynamic_pointer_cast<AudioContent> (s));
}
-
+
film_content_changed (s, ContentProperty::START);
film_content_changed (s, ContentProperty::LENGTH);
film_content_changed (s, VideoContentProperty::VIDEO_CROP);
film_content_changed (s, FFmpegContentProperty::AUDIO_STREAM);
film_content_changed (s, FFmpegContentProperty::AUDIO_STREAMS);
film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAM);
+ film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAMS);
+ film_content_changed (s, FFmpegContentProperty::FILTERS);
+ film_content_changed (s, SubtitleContentProperty::SUBTITLE_OFFSET);
+ film_content_changed (s, SubtitleContentProperty::SUBTITLE_SCALE);
}
void
return dynamic_pointer_cast<AudioContent> (c);
}
+shared_ptr<SubtitleContent>
+FilmEditor::selected_subtitle_content ()
+{
+ shared_ptr<Content> c = selected_content ();
+ if (!c) {
+ return shared_ptr<SubtitleContent> ();
+ }
+
+ return dynamic_pointer_cast<SubtitleContent> (c);
+}
+
void
FilmEditor::setup_scaling_description ()
{
+ shared_ptr<VideoContent> vc = selected_video_content ();
+ if (!vc) {
+ _scaling_description->SetLabel ("");
+ return;
+ }
+
wxString d;
-#if 0
-XXX
int lines = 0;
- if (_film->video_size().width && _film->video_size().height) {
+ if (vc->video_size().width && vc->video_size().height) {
d << wxString::Format (
_("Original video is %dx%d (%.2f:1)\n"),
- _film->video_size().width, _film->video_size().height,
- float (_film->video_size().width) / _film->video_size().height
+ vc->video_size().width, vc->video_size().height,
+ float (vc->video_size().width) / vc->video_size().height
);
++lines;
}
- Crop const crop = _film->crop ();
- if ((crop.left || crop.right || crop.top || crop.bottom) && _film->size() != libdcp::Size (0, 0)) {
- libdcp::Size const cropped = _film->cropped_size (_film->size ());
+ Crop const crop = vc->crop ();
+ if ((crop.left || crop.right || crop.top || crop.bottom) && vc->video_size() != libdcp::Size (0, 0)) {
+ libdcp::Size cropped = vc->video_size ();
+ cropped.width -= crop.left + crop.right;
+ cropped.height -= crop.top + crop.bottom;
d << wxString::Format (
_("Cropped to %dx%d (%.2f:1)\n"),
cropped.width, cropped.height,
++lines;
}
- Format const * format = _film->format ();
- if (format) {
- int const padding = format->dcp_padding (_film);
- libdcp::Size scaled = format->dcp_size ();
- scaled.width -= padding * 2;
+ Ratio const * ratio = vc->ratio ();
+ if (ratio) {
+ libdcp::Size container_size = _film->container()->size (_film->full_frame ());
+
+ libdcp::Size const scaled = ratio->size (container_size);
d << wxString::Format (
_("Scaled to %dx%d (%.2f:1)\n"),
scaled.width, scaled.height,
);
++lines;
- if (padding) {
+ if (scaled != container_size) {
d << wxString::Format (
_("Padded with black to %dx%d (%.2f:1)\n"),
- format->dcp_size().width, format->dcp_size().height,
- float (format->dcp_size().width) / format->dcp_size().height
+ container_size.width, container_size.height,
+ float (container_size.width) / container_size.height
);
++lines;
}
d << wxT ("\n ");
}
-#endif
_scaling_description->SetLabel (d);
}
projects / dcpomatic.git / blobdiff