X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=3e2eaa8a282a05ef2d3ca794a303bb1d9b35b53b;hb=498e3c0ee1da5a4f50bc019e9a760689a930c06c;hp=31595116824f7d190eeea601efe6b33b1856e175;hpb=adb9882ec12fecb0bbb1925a46c8e63368f9e2b5;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 315951168..3e2eaa8a2 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2013 Carl Hetherington 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 @@ -36,21 +36,22 @@ #include "lib/filter.h" #include "lib/ratio.h" #include "lib/config.h" -#include "lib/imagemagick_content.h" +#include "lib/still_image_content.h" #include "lib/sndfile_content.h" #include "lib/dcp_content_type.h" +#include "lib/sound_processor.h" +#include "lib/scaler.h" +#include "timecode.h" #include "filter_dialog.h" #include "wx_util.h" #include "film_editor.h" #include "gain_calculator_dialog.h" -#include "sound_processor.h" #include "dci_metadata_dialog.h" -#include "scaler.h" #include "audio_dialog.h" -#include "imagemagick_content_dialog.h" #include "timeline_dialog.h" #include "audio_mapping_view.h" -#include "timecode.h" +#include "timing_panel.h" +#include "subtitle_panel.h" using std::string; using std::cout; @@ -69,6 +70,7 @@ using boost::lexical_cast; /** @param f Film to edit */ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) : wxPanel (parent) + , _menu (f, this) , _generally_sensitive (true) , _audio_dialog (0) , _timeline_dialog (0) @@ -139,7 +141,7 @@ FilmEditor::make_dcp_panel () ++r; { - add_label_to_grid_bag_sizer (grid, _dcp_panel, _("DCP Frame Rate"), true, wxGBPosition (r, 0)); + add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Frame Rate"), true, wxGBPosition (r, 0)); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _dcp_frame_rate = new wxChoice (_dcp_panel, wxID_ANY); s->Add (_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL); @@ -149,6 +151,16 @@ FilmEditor::make_dcp_panel () } ++r; + add_label_to_grid_bag_sizer (grid, _dcp_panel, _("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, _("Resolution"), true, wxGBPosition (r, 0)); + _dcp_resolution = new wxChoice (_dcp_panel, wxID_ANY); + grid->Add (_dcp_resolution, wxGBPosition (r, 1)); + ++r; + { add_label_to_grid_bag_sizer (grid, _dcp_panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0)); wxSizer* s = new wxBoxSizer (wxHORIZONTAL); @@ -184,49 +196,49 @@ FilmEditor::make_dcp_panel () _dcp_frame_rate->Append (std_to_wx (boost::lexical_cast (*i))); } + _dcp_audio_channels->SetRange (0, MAX_AUDIO_CHANNELS); _j2k_bandwidth->SetRange (50, 250); + + _dcp_resolution->Append (_("2K")); + _dcp_resolution->Append (_("4K")); } void FilmEditor::connect_to_widgets () { - _name->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::name_changed), 0, this); - _use_dci_name->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this); - _edit_dci_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this); - _container->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::container_changed), 0, this); - _ratio->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::ratio_changed), 0, this); - _content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler (FilmEditor::content_selection_changed), 0, this); - _content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler (FilmEditor::content_selection_changed), 0, this); - _content_add->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this); - _content_remove->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this); - _content_timeline->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_timeline_clicked), 0, this); - _loop_content->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::loop_content_toggled), 0, this); - _loop_count->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::loop_count_changed), 0, this); - _left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this); - _right_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this); - _top_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this); - _bottom_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this); - _filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this); - _scaler->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::scaler_changed), 0, this); - _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); - _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); + _name->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::name_changed), 0, this); + _use_dci_name->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this); + _edit_dci_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this); + _container->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::container_changed), 0, this); + _ratio->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::ratio_changed), 0, this); + _content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler (FilmEditor::content_selection_changed), 0, this); + _content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler (FilmEditor::content_selection_changed), 0, this); + _content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,wxListEventHandler (FilmEditor::content_right_click), 0, this); + _content_add->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this); + _content_remove->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this); + _content_timeline->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_timeline_clicked), 0, this); + _left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this); + _right_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this); + _top_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this); + _bottom_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this); + _filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this); + _scaler->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::scaler_changed), 0, this); + _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); + _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 ( wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 0, this ); - _show_audio->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::show_audio_clicked), 0, this); - _audio_delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this); - _audio_stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this); - _subtitle_stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this); - _audio_mapping->Changed.connect (boost::bind (&FilmEditor::audio_mapping_changed, this, _1)); - _start->Changed.connect (boost::bind (&FilmEditor::start_changed, this)); - _length->Changed.connect (boost::bind (&FilmEditor::length_changed, this)); + _show_audio->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::show_audio_clicked), 0, this); + _audio_delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this); + _audio_stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this); + _dcp_resolution->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_resolution_changed), 0, this); + _sequence_video->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::sequence_video_changed), 0, this); + + _audio_mapping->Changed.connect (boost::bind (&FilmEditor::audio_mapping_changed, this, _1)); } void @@ -285,15 +297,6 @@ FilmEditor::make_video_panel () } ++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); @@ -307,49 +310,40 @@ FilmEditor::make_content_panel () _content_sizer = new wxBoxSizer (wxVERTICAL); _content_panel->SetSizer (_content_sizer); - { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - - _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL); - s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + + _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL); + s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6); - _content->InsertColumn (0, wxT("")); + _content->InsertColumn (0, wxT("")); _content->SetColumnWidth (0, 512); - wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); - _content_add = new wxButton (_content_panel, wxID_ANY, _("Add...")); - b->Add (_content_add, 1, wxEXPAND | wxLEFT | wxRIGHT); - _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove")); - b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT); + wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); + _content_add = new wxButton (_content_panel, wxID_ANY, _("Add...")); + b->Add (_content_add, 1, wxEXPAND | wxLEFT | wxRIGHT); + _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove")); + b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT); _content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline...")); b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT); - s->Add (b, 0, wxALL, 4); + s->Add (b, 0, wxALL, 4); - _content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6); - } + _content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6); + } - wxBoxSizer* h = new wxBoxSizer (wxHORIZONTAL); - _loop_content = new wxCheckBox (_content_panel, wxID_ANY, _("Loop everything")); - h->Add (_loop_content, 0, wxALL, 6); - _loop_count = new wxSpinCtrl (_content_panel, wxID_ANY); - h->Add (_loop_count, 0, wxALL, 6); - add_label_to_sizer (h, _content_panel, _("times"), false); - _content_sizer->Add (h, 0, wxALL, 6); + _sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence")); + _content_sizer->Add (_sequence_video); - _content_notebook = new wxNotebook (_content_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_LEFT); + _content_notebook = new wxNotebook (_content_panel, wxID_ANY); _content_sizer->Add (_content_notebook, 1, wxEXPAND | wxTOP, 6); make_video_panel (); _content_notebook->AddPage (_video_panel, _("Video"), false); make_audio_panel (); _content_notebook->AddPage (_audio_panel, _("Audio"), false); - make_subtitle_panel (); - _content_notebook->AddPage (_subtitle_panel, _("Subtitles"), false); - make_timing_panel (); - _content_notebook->AddPage (_timing_panel, _("Timing"), false); - - _loop_count->SetRange (2, 1024); + _subtitle_panel = new SubtitlePanel (this); + _timing_panel = new TimingPanel (this); } void @@ -408,63 +402,6 @@ FilmEditor::make_audio_panel () _audio_delay->SetRange (-1000, 1000); } -void -FilmEditor::make_subtitle_panel () -{ - _subtitle_panel = new wxPanel (_content_notebook); - wxBoxSizer* subtitle_sizer = new wxBoxSizer (wxVERTICAL); - _subtitle_panel->SetSizer (subtitle_sizer); - wxFlexGridSizer* grid = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - subtitle_sizer->Add (grid, 0, wxALL, 8); - - _with_subtitles = new wxCheckBox (_subtitle_panel, wxID_ANY, _("With Subtitles")); - grid->Add (_with_subtitles, 1); - grid->AddSpacer (0); - - { - add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Offset"), true); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _subtitle_offset = new wxSpinCtrl (_subtitle_panel); - s->Add (_subtitle_offset); - add_label_to_sizer (s, _subtitle_panel, _("pixels"), false); - grid->Add (s); - } - - { - add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Scale"), true); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _subtitle_scale = new wxSpinCtrl (_subtitle_panel); - s->Add (_subtitle_scale); - 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); - - _subtitle_offset->SetRange (-1024, 1024); - _subtitle_scale->SetRange (1, 1000); -} - -void -FilmEditor::make_timing_panel () -{ - _timing_panel = new wxPanel (_content_notebook); - wxBoxSizer* timing_sizer = new wxBoxSizer (wxVERTICAL); - _timing_panel->SetSizer (timing_sizer); - wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); - timing_sizer->Add (grid, 0, wxALL, 8); - - add_label_to_sizer (grid, _timing_panel, _("Start time"), true); - _start = new Timecode (_timing_panel); - grid->Add (_start); - add_label_to_sizer (grid, _timing_panel, _("Length"), true); - _length = new Timecode (_timing_panel); - grid->Add (_length); -} - - /** Called when the left crop widget has been changed */ void FilmEditor::left_crop_changed (wxCommandEvent &) @@ -525,57 +462,47 @@ FilmEditor::name_changed (wxCommandEvent &) } void -FilmEditor::subtitle_offset_changed (wxCommandEvent &) +FilmEditor::j2k_bandwidth_changed (wxCommandEvent &) { if (!_film) { return; } - - _film->set_subtitle_offset (_subtitle_offset->GetValue ()); + + _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1e6); } void -FilmEditor::subtitle_scale_changed (wxCommandEvent &) +FilmEditor::dcp_frame_rate_changed (wxCommandEvent &) { if (!_film) { return; } - _film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0); + _film->set_dcp_video_frame_rate ( + boost::lexical_cast ( + wx_to_std (_dcp_frame_rate->GetString (_dcp_frame_rate->GetSelection ())) + ) + ); } void -FilmEditor::colour_lut_changed (wxCommandEvent &) +FilmEditor::dcp_audio_channels_changed (wxCommandEvent &) { if (!_film) { return; } - - _film->set_colour_lut (_colour_lut->GetSelection ()); -} -void -FilmEditor::j2k_bandwidth_changed (wxCommandEvent &) -{ - if (!_film) { - return; - } - - _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1e6); + _film->set_dcp_audio_channels (_dcp_audio_channels->GetValue ()); } void -FilmEditor::dcp_frame_rate_changed (wxCommandEvent &) +FilmEditor::dcp_resolution_changed (wxCommandEvent &) { if (!_film) { return; } - _film->set_dcp_video_frame_rate ( - boost::lexical_cast ( - wx_to_std (_dcp_frame_rate->GetString (_dcp_frame_rate->GetSelection ())) - ) - ); + _film->set_resolution (_dcp_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K); } @@ -593,20 +520,17 @@ FilmEditor::film_changed (Film::Property p) } stringstream s; + + _subtitle_panel->film_changed (p); + _timing_panel->film_changed (p); switch (p) { case Film::NONE: break; case Film::CONTENT: setup_content (); - setup_subtitle_control_sensitivity (); setup_show_audio_sensitivity (); break; - case Film::LOOP: - checked_set (_loop_content, _film->loop() > 1); - checked_set (_loop_count, _film->loop()); - setup_loop_sensitivity (); - break; case Film::CONTAINER: setup_container (); break; @@ -614,6 +538,9 @@ FilmEditor::film_changed (Film::Property p) checked_set (_name, _film->name()); setup_dcp_name (); break; + case Film::WITH_SUBTITLES: + setup_dcp_name (); + break; case Film::DCP_CONTENT_TYPE: checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ())); setup_dcp_name (); @@ -621,20 +548,10 @@ FilmEditor::film_changed (Film::Property p) case Film::SCALER: checked_set (_scaler, Scaler::as_index (_film->scaler ())); break; - case Film::WITH_SUBTITLES: - checked_set (_with_subtitles, _film->with_subtitles ()); - setup_subtitle_control_sensitivity (); + case Film::RESOLUTION: + checked_set (_dcp_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1); 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; @@ -663,12 +580,22 @@ FilmEditor::film_changed (Film::Property p) _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 ()); + setup_dcp_name (); + break; + case Film::SEQUENCE_VIDEO: + checked_set (_sequence_video, _film->sequence_video ()); + break; } } void FilmEditor::film_content_changed (weak_ptr weak_content, int property) { + ensure_ui_thread (); + if (!_film) { /* We call this method ourselves (as well as using it as a signal handler) so _film can be 0. @@ -677,33 +604,30 @@ FilmEditor::film_content_changed (weak_ptr weak_content, int property) } shared_ptr content = weak_content.lock (); + if (content != selected_content ()) { + return; + } + shared_ptr video_content; shared_ptr audio_content; + shared_ptr subtitle_content; shared_ptr ffmpeg_content; if (content) { video_content = dynamic_pointer_cast (content); audio_content = dynamic_pointer_cast (content); + subtitle_content = dynamic_pointer_cast (content); ffmpeg_content = dynamic_pointer_cast (content); } + _subtitle_panel->film_content_changed (content, subtitle_content, ffmpeg_content, property); + _timing_panel->film_content_changed (content, subtitle_content, ffmpeg_content, property); + /* We can't use case {} here */ - if (property == ContentProperty::START) { - if (content) { - _start->set (content->start (), _film->dcp_video_frame_rate ()); - } else { - _start->set (0, 24); - } - } else if (property == ContentProperty::LENGTH) { - if (content) { - _length->set (content->length (), _film->dcp_video_frame_rate ()); - } else { - _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); + 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 (_bottom_crop, video_content ? video_content->crop().bottom : 0); setup_scaling_description (); } else if (property == VideoContentProperty::VIDEO_RATIO) { @@ -731,24 +655,6 @@ FilmEditor::film_content_changed (weak_ptr weak_content, int property) checked_set (_audio_delay, audio_content ? audio_content->audio_delay() : 0); } else if (property == AudioContentProperty::AUDIO_MAPPING) { _audio_mapping->set (audio_content ? audio_content->audio_mapping () : AudioMapping ()); - } else if (property == FFmpegContentProperty::SUBTITLE_STREAMS) { - _subtitle_stream->Clear (); - if (ffmpeg_content) { - vector > s = ffmpeg_content->subtitle_streams (); - if (s.empty ()) { - _subtitle_stream->Enable (false); - } - for (vector >::iterator i = s.begin(); i != s.end(); ++i) { - _subtitle_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast ((*i)->id)))); - } - - if (ffmpeg_content->subtitle_stream()) { - checked_set (_subtitle_stream, lexical_cast (ffmpeg_content->subtitle_stream()->id)); - } else { - _subtitle_stream->SetSelection (wxNOT_FOUND); - } - } - setup_subtitle_control_sensitivity (); } else if (property == FFmpegContentProperty::AUDIO_STREAMS) { _audio_stream->Clear (); if (ffmpeg_content) { @@ -856,17 +762,20 @@ FilmEditor::set_film (shared_ptr f) film_changed (Film::NAME); film_changed (Film::USE_DCI_NAME); film_changed (Film::CONTENT); - film_changed (Film::LOOP); film_changed (Film::DCP_CONTENT_TYPE); film_changed (Film::CONTAINER); + film_changed (Film::RESOLUTION); 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); + film_changed (Film::SEQUENCE_VIDEO); + + if (!_film->content().empty ()) { + set_selection (_film->content().front ()); + } wxListEvent ev; content_selection_changed (ev); @@ -892,21 +801,19 @@ FilmEditor::set_things_sensitive (bool s) _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); _show_audio->Enable (s); _audio_delay->Enable (s); _container->Enable (s); - _loop_content->Enable (s); - _loop_count->Enable (s); - setup_subtitle_control_sensitivity (); + _subtitle_panel->setup_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 */ @@ -965,20 +872,6 @@ FilmEditor::audio_delay_changed (wxCommandEvent &) ac->set_audio_delay (_audio_delay->GetValue ()); } -void -FilmEditor::setup_main_notebook_size () -{ - _main_notebook->InvalidateBestSize (); - - _content_sizer->Layout (); - _content_sizer->SetSizeHints (_content_panel); - _dcp_sizer->Layout (); - _dcp_sizer->SetSizeHints (_dcp_panel); - - _main_notebook->Fit (); - Fit (); -} - void FilmEditor::audio_gain_calculate_button_clicked (wxCommandEvent &) { @@ -1019,35 +912,6 @@ FilmEditor::setup_ratios () _dcp_sizer->Layout (); } -void -FilmEditor::with_subtitles_toggled (wxCommandEvent &) -{ - if (!_film) { - return; - } - - _film->set_with_subtitles (_with_subtitles->GetValue ()); -} - -void -FilmEditor::setup_subtitle_control_sensitivity () -{ - bool h = false; - if (_generally_sensitive && _film) { - h = _film->has_subtitles (); - } - - _with_subtitles->Enable (h); - - bool j = false; - if (_film) { - j = _film->with_subtitles (); - } - - _subtitle_offset->Enable (j); - _subtitle_scale->Enable (j); -} - void FilmEditor::use_dci_name_toggled (wxCommandEvent &) { @@ -1139,8 +1003,8 @@ FilmEditor::setup_content () _content->DeleteAllItems (); - Playlist::ContentList content = _film->content (); - for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) { + ContentList content = _film->content (); + for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { int const t = _content->GetItemCount (); _content->InsertItem (t, std_to_wx ((*i)->summary ())); if ((*i)->summary() == selected_summary) { @@ -1173,8 +1037,8 @@ FilmEditor::content_add_clicked (wxCommandEvent &) shared_ptr c; - if (ImageMagickContent::valid_file (p)) { - c.reset (new ImageMagickContent (_film, p)); + if (StillImageContent::valid_file (p)) { + c.reset (new StillImageContent (_film, p)); } else if (SndfileContent::valid_file (p)) { c.reset (new SndfileContent (_film, p)); } else { @@ -1192,18 +1056,21 @@ FilmEditor::content_remove_clicked (wxCommandEvent &) if (c) { _film->remove_content (c); } + + wxListEvent ev; + content_selection_changed (ev); } void FilmEditor::content_selection_changed (wxListEvent &) { - setup_content_sensitivity (); + setup_content_sensitivity (); shared_ptr s = selected_content (); if (_audio_dialog && s && dynamic_pointer_cast (s)) { _audio_dialog->set_content (dynamic_pointer_cast (s)); } - + film_content_changed (s, ContentProperty::START); film_content_changed (s, ContentProperty::LENGTH); film_content_changed (s, VideoContentProperty::VIDEO_CROP); @@ -1214,22 +1081,26 @@ FilmEditor::content_selection_changed (wxListEvent &) 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 FilmEditor::setup_content_sensitivity () { - _content_add->Enable (_generally_sensitive); + _content_add->Enable (_generally_sensitive); shared_ptr selection = selected_content (); - _content_remove->Enable (selection && _generally_sensitive); + _content_remove->Enable (selection && _generally_sensitive); _content_timeline->Enable (_generally_sensitive); - _video_panel->Enable (selection && dynamic_pointer_cast (selection) && _generally_sensitive); - _audio_panel->Enable (selection && dynamic_pointer_cast (selection) && _generally_sensitive); + _video_panel->Enable (selection && dynamic_pointer_cast (selection) && _generally_sensitive); + _audio_panel->Enable (selection && dynamic_pointer_cast (selection) && _generally_sensitive); _subtitle_panel->Enable (selection && dynamic_pointer_cast (selection) && _generally_sensitive); - _timing_panel->Enable (selection && _generally_sensitive); + _timing_panel->Enable (selection && _generally_sensitive); } shared_ptr @@ -1240,7 +1111,7 @@ FilmEditor::selected_content () return shared_ptr (); } - Playlist::ContentList c = _film->content (); + ContentList c = _film->content (); if (s < 0 || size_t (s) >= c.size ()) { return shared_ptr (); } @@ -1270,6 +1141,17 @@ FilmEditor::selected_audio_content () return dynamic_pointer_cast (c); } +shared_ptr +FilmEditor::selected_subtitle_content () +{ + shared_ptr c = selected_content (); + if (!c) { + return shared_ptr (); + } + + return dynamic_pointer_cast (c); +} + void FilmEditor::setup_scaling_description () { @@ -1334,30 +1216,6 @@ FilmEditor::setup_scaling_description () _scaling_description->SetLabel (d); } -void -FilmEditor::loop_content_toggled (wxCommandEvent &) -{ - if (_loop_content->GetValue ()) { - _film->set_loop (_loop_count->GetValue ()); - } else { - _film->set_loop (1); - } - - setup_loop_sensitivity (); -} - -void -FilmEditor::loop_count_changed (wxCommandEvent &) -{ - _film->set_loop (_loop_count->GetValue ()); -} - -void -FilmEditor::setup_loop_sensitivity () -{ - _loop_count->Enable (_loop_content->GetValue ()); -} - void FilmEditor::content_timeline_clicked (wxCommandEvent &) { @@ -1408,33 +1266,6 @@ FilmEditor::audio_stream_changed (wxCommandEvent &) } } - - -void -FilmEditor::subtitle_stream_changed (wxCommandEvent &) -{ - shared_ptr c = selected_content (); - if (!c) { - return; - } - - shared_ptr fc = dynamic_pointer_cast (c); - if (!fc) { - return; - } - - vector > a = fc->subtitle_streams (); - vector >::iterator i = a.begin (); - string const s = string_client_data (_subtitle_stream->GetClientObject (_subtitle_stream->GetSelection ())); - while (i != a.end() && lexical_cast ((*i)->id) != s) { - ++i; - } - - if (i != a.end ()) { - fc->set_subtitle_stream (*i); - } -} - void FilmEditor::audio_mapping_changed (AudioMapping m) { @@ -1451,35 +1282,10 @@ FilmEditor::audio_mapping_changed (AudioMapping m) ac->set_audio_mapping (m); } -void -FilmEditor::start_changed () -{ - shared_ptr c = selected_content (); - if (!c) { - return; - } - - c->set_start (_start->get (_film->dcp_video_frame_rate ())); -} - -void -FilmEditor::length_changed () -{ - shared_ptr c = selected_content (); - if (!c) { - return; - } - - shared_ptr ic = dynamic_pointer_cast (c); - if (ic) { - ic->set_video_length (_length->get(_film->dcp_video_frame_rate()) * ic->video_frame_rate() / TIME_HZ); - } -} - void FilmEditor::set_selection (weak_ptr wc) { - Playlist::ContentList content = _film->content (); + ContentList content = _film->content (); for (size_t i = 0; i < content.size(); ++i) { if (content[i] == wc.lock ()) { _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); @@ -1513,3 +1319,17 @@ FilmEditor::ratio_changed (wxCommandEvent &) vc->set_ratio (ratios[n]); } } + +void +FilmEditor::sequence_video_changed (wxCommandEvent &) +{ + _film->set_sequence_video (_sequence_video->GetValue ()); +} + +void +FilmEditor::content_right_click (wxListEvent& ev) +{ + ContentList cl; + cl.push_back (selected_content ()); + _menu.popup (cl, ev.GetPoint ()); +}