X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=d037ccd50628c75100e3d1a0d05f4701ee425056;hb=f021a24c9db4df2afb096392f9da18dba80b25d3;hp=14982e0d302c46ecbcd77ecd915f574095fc3493;hpb=097a1fb413bbbb89182161d4c1a31daa5419ec96;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 14982e0d3..d037ccd50 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2014 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 @@ -40,20 +40,21 @@ #include "lib/ffmpeg_content.h" #include "lib/sndfile_content.h" #include "lib/dcp_content_type.h" -#include "lib/sound_processor.h" #include "lib/scaler.h" #include "lib/playlist.h" #include "lib/content.h" #include "lib/content_factory.h" +#include "lib/dcp_content.h" #include "timecode.h" #include "wx_util.h" #include "film_editor.h" -#include "dci_metadata_dialog.h" +#include "isdcf_metadata_dialog.h" #include "timeline_dialog.h" #include "timing_panel.h" #include "subtitle_panel.h" #include "audio_panel.h" #include "video_panel.h" +#include "content_panel.h" using std::string; using std::cout; @@ -72,17 +73,15 @@ using boost::lexical_cast; /** @param f Film to edit */ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) : wxPanel (parent) - , _menu (f, this) , _generally_sensitive (true) - , _timeline_dialog (0) { wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); _main_notebook = new wxNotebook (this, wxID_ANY); s->Add (_main_notebook, 1); - make_content_panel (); - _main_notebook->AddPage (_content_panel, _("Content"), true); + _content_panel = new ContentPanel (_main_notebook, _film); + _main_notebook->AddPage (_content_panel->panel (), _("Content"), true); make_dcp_panel (); _main_notebook->AddPage (_dcp_panel, _("DCP"), false); @@ -92,6 +91,8 @@ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) JobManager::instance()->ActiveJobsChanged.connect ( bind (&FilmEditor::active_jobs_changed, this, _1) ); + + Config::instance()->Changed.connect (boost::bind (&FilmEditor::config_changed, this)); SetSizerAndFit (s); } @@ -123,10 +124,10 @@ FilmEditor::make_dcp_panel () flags |= wxALIGN_RIGHT; #endif - _use_dci_name = new wxCheckBox (_dcp_panel, wxID_ANY, _("Use DCI name")); - grid->Add (_use_dci_name, wxGBPosition (r, 0), wxDefaultSpan, flags); - _edit_dci_button = new wxButton (_dcp_panel, wxID_ANY, _("Details...")); - grid->Add (_edit_dci_button, wxGBPosition (r, 1), wxDefaultSpan); + _use_isdcf_name = new wxCheckBox (_dcp_panel, wxID_ANY, _("Use ISDCF name")); + grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); + _edit_isdcf_button = new wxButton (_dcp_panel, wxID_ANY, _("Details...")); + grid->Add (_edit_isdcf_button, wxGBPosition (r, 1), wxDefaultSpan); ++r; add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Container"), true, wxGBPosition (r, 0)); @@ -141,15 +142,22 @@ FilmEditor::make_dcp_panel () { add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Frame Rate"), true, wxGBPosition (r, 0)); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _frame_rate = new wxChoice (_dcp_panel, wxID_ANY); - s->Add (_frame_rate, 1, wxALIGN_CENTER_VERTICAL); + _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL); + _frame_rate_choice = new wxChoice (_dcp_panel, wxID_ANY); + _frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL); + _frame_rate_spin = new wxSpinCtrl (_dcp_panel, wxID_ANY); + _frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL); + setup_frame_rate_widget (); _best_frame_rate = new wxButton (_dcp_panel, wxID_ANY, _("Use best")); - s->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND); - grid->Add (s, wxGBPosition (r, 1)); + _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND); + grid->Add (_frame_rate_sizer, wxGBPosition (r, 1)); } ++r; + _burn_subtitles = new wxCheckBox (_dcp_panel, wxID_ANY, _("Burn subtitles into image")); + grid->Add (_burn_subtitles, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + _signed = new wxCheckBox (_dcp_panel, wxID_ANY, _("Signed")); grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -177,7 +185,7 @@ FilmEditor::make_dcp_panel () wxSizer* s = new wxBoxSizer (wxHORIZONTAL); _j2k_bandwidth = new wxSpinCtrl (_dcp_panel, wxID_ANY); s->Add (_j2k_bandwidth, 1); - add_label_to_sizer (s, _dcp_panel, _("MBps"), false); + add_label_to_sizer (s, _dcp_panel, _("Mbit/s"), false); grid->Add (s, wxGBPosition (r, 1)); } ++r; @@ -209,11 +217,12 @@ FilmEditor::make_dcp_panel () list const dfr = Config::instance()->allowed_dcp_frame_rates (); for (list::const_iterator i = dfr.begin(); i != dfr.end(); ++i) { - _frame_rate->Append (std_to_wx (boost::lexical_cast (*i))); + _frame_rate_choice->Append (std_to_wx (boost::lexical_cast (*i))); } - _audio_channels->SetRange (0, MAX_AUDIO_CHANNELS); - _j2k_bandwidth->SetRange (1, 250); + _audio_channels->SetRange (0, MAX_DCP_AUDIO_CHANNELS); + _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); + _frame_rate_spin->SetRange (1, 480); _resolution->Append (_("2K")); _resolution->Append (_("4K")); @@ -226,83 +235,24 @@ void FilmEditor::connect_to_widgets () { _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&FilmEditor::name_changed, this)); - _use_dci_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::use_dci_name_toggled, this)); - _edit_dci_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::edit_dci_button_clicked, this)); + _use_isdcf_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::use_isdcf_name_toggled, this)); + _edit_isdcf_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::edit_isdcf_button_clicked, this)); _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::container_changed, this)); - _content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&FilmEditor::content_selection_changed, this)); - _content->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&FilmEditor::content_selection_changed, this)); - _content->Bind (wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, boost::bind (&FilmEditor::content_right_click, this, _1)); - _content_add_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_add_file_clicked, this)); - _content_add_folder->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_add_folder_clicked, this)); - _content_remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_remove_clicked, this)); - _content_earlier->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_earlier_clicked, this)); - _content_later->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_later_clicked, this)); - _content_timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_timeline_clicked, this)); _scaler->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::scaler_changed, this)); _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::dcp_content_type_changed, this)); - _frame_rate->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::frame_rate_changed, this)); + _frame_rate_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::frame_rate_choice_changed, this)); + _frame_rate_spin->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::frame_rate_spin_changed, this)); _best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::best_frame_rate_clicked, this)); + _burn_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::burn_subtitles_toggled, this)); _signed->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::signed_toggled, this)); _encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::encrypted_toggled, this)); _audio_channels->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::audio_channels_changed, this)); _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::j2k_bandwidth_changed, this)); _resolution->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::resolution_changed, this)); - _sequence_video->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::sequence_video_changed, this)); _three_d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::three_d_changed, this)); _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::standard_changed, this)); } -void -FilmEditor::make_content_panel () -{ - _content_panel = new wxPanel (_main_notebook); - _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); - s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6); - - _content->InsertColumn (0, wxT("")); - _content->SetColumnWidth (0, 512); - - wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); - _content_add_file = new wxButton (_content_panel, wxID_ANY, _("Add file(s)...")); - b->Add (_content_add_file, 1, wxEXPAND | wxLEFT | wxRIGHT); - _content_add_folder = new wxButton (_content_panel, wxID_ANY, _("Add folder...")); - b->Add (_content_add_folder, 1, wxEXPAND | wxLEFT | wxRIGHT); - _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove")); - b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT); - _content_earlier = new wxButton (_content_panel, wxID_UP); - b->Add (_content_earlier, 1, wxEXPAND); - _content_later = new wxButton (_content_panel, wxID_DOWN); - b->Add (_content_later, 1, wxEXPAND); - _content_timeline = new wxButton (_content_panel, wxID_ANY, _("DCPTimeline...")); - b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT); - - s->Add (b, 0, wxALL, 4); - - _content_sizer->Add (s, 0.75, wxEXPAND | 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); - _content_sizer->Add (_content_notebook, 1, wxEXPAND | wxTOP, 6); - - _video_panel = new VideoPanel (this); - _panels.push_back (_video_panel); - _audio_panel = new AudioPanel (this); - _panels.push_back (_audio_panel); - _subtitle_panel = new SubtitlePanel (this); - _panels.push_back (_subtitle_panel); - _timing_panel = new TimingPanel (this); - _panels.push_back (_timing_panel); -} - /** Called when the name widget has been changed */ void FilmEditor::name_changed () @@ -334,6 +284,16 @@ FilmEditor::signed_toggled () _film->set_signed (_signed->GetValue ()); } +void +FilmEditor::burn_subtitles_toggled () +{ + if (!_film) { + return; + } + + _film->set_burn_subtitles (_burn_subtitles->GetValue ()); +} + void FilmEditor::encrypted_toggled () { @@ -344,9 +304,9 @@ FilmEditor::encrypted_toggled () _film->set_encrypted (_encrypted->GetValue ()); } -/** Called when the name widget has been changed */ +/** Called when the frame rate choice widget has been changed */ void -FilmEditor::frame_rate_changed () +FilmEditor::frame_rate_choice_changed () { if (!_film) { return; @@ -354,11 +314,22 @@ FilmEditor::frame_rate_changed () _film->set_video_frame_rate ( boost::lexical_cast ( - wx_to_std (_frame_rate->GetString (_frame_rate->GetSelection ())) + wx_to_std (_frame_rate_choice->GetString (_frame_rate_choice->GetSelection ())) ) ); } +/** Called when the frame rate spin widget has been changed */ +void +FilmEditor::frame_rate_spin_changed () +{ + if (!_film) { + return; + } + + _film->set_video_frame_rate (_frame_rate_spin->GetValue ()); +} + void FilmEditor::audio_channels_changed () { @@ -404,16 +375,11 @@ FilmEditor::film_changed (Film::Property p) stringstream s; - for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { - (*i)->film_changed (p); - } - + _content_panel->film_changed (p); + switch (p) { case Film::NONE: break; - case Film::CONTENT: - setup_content (); - break; case Film::CONTAINER: setup_container (); break; @@ -421,9 +387,6 @@ 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 (); @@ -431,6 +394,9 @@ FilmEditor::film_changed (Film::Property p) case Film::SCALER: checked_set (_scaler, Scaler::as_index (_film->scaler ())); break; + case Film::BURN_SUBTITLES: + checked_set (_burn_subtitles, _film->burn_subtitles ()); + break; case Film::SIGNED: checked_set (_signed, _film->is_signed ()); break; @@ -450,28 +416,30 @@ FilmEditor::film_changed (Film::Property p) case Film::J2K_BANDWIDTH: checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000); break; - case Film::USE_DCI_NAME: - checked_set (_use_dci_name, _film->use_dci_name ()); + case Film::USE_ISDCF_NAME: + checked_set (_use_isdcf_name, _film->use_isdcf_name ()); setup_dcp_name (); break; - case Film::DCI_METADATA: + case Film::ISDCF_METADATA: setup_dcp_name (); break; case Film::VIDEO_FRAME_RATE: { bool done = false; - for (unsigned int i = 0; i < _frame_rate->GetCount(); ++i) { - if (wx_to_std (_frame_rate->GetString(i)) == boost::lexical_cast (_film->video_frame_rate())) { - checked_set (_frame_rate, i); + for (unsigned int i = 0; i < _frame_rate_choice->GetCount(); ++i) { + if (wx_to_std (_frame_rate_choice->GetString(i)) == boost::lexical_cast (_film->video_frame_rate())) { + checked_set (_frame_rate_choice, i); done = true; break; } } if (!done) { - checked_set (_frame_rate, -1); + checked_set (_frame_rate_choice, -1); } + _frame_rate_spin->SetValue (_film->video_frame_rate ()); + _best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ()); break; } @@ -479,9 +447,6 @@ FilmEditor::film_changed (Film::Property p) checked_set (_audio_channels, _film->audio_channels ()); setup_dcp_name (); break; - case Film::SEQUENCE_VIDEO: - checked_set (_sequence_video, _film->sequence_video ()); - break; case Film::THREE_D: checked_set (_three_d, _film->three_d ()); setup_dcp_name (); @@ -489,6 +454,8 @@ FilmEditor::film_changed (Film::Property p) case Film::INTEROP: checked_set (_standard, _film->interop() ? 1 : 0); break; + default: + break; } } @@ -504,14 +471,10 @@ FilmEditor::film_content_changed (int property) return; } - for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { - (*i)->film_content_changed (property); - } + _content_panel->film_content_changed (property); - if (property == FFmpegContentProperty::AUDIO_STREAM) { + if (property == FFmpegContentProperty::AUDIO_STREAM || property == SubtitleContentProperty::USE_SUBTITLES) { setup_dcp_name (); - } else if (property == ContentProperty::PATH) { - setup_content (); } } @@ -577,6 +540,8 @@ FilmEditor::set_film (shared_ptr f) _film = f; + _content_panel->set_film (_film); + if (_film) { _film->Changed.connect (bind (&FilmEditor::film_changed, this, _1)); _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _2)); @@ -589,17 +554,17 @@ FilmEditor::set_film (shared_ptr f) } film_changed (Film::NAME); - film_changed (Film::USE_DCI_NAME); + film_changed (Film::USE_ISDCF_NAME); film_changed (Film::CONTENT); 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::SIGNED); + film_changed (Film::BURN_SUBTITLES); film_changed (Film::ENCRYPTED); film_changed (Film::J2K_BANDWIDTH); - film_changed (Film::DCI_METADATA); + film_changed (Film::ISDCF_METADATA); film_changed (Film::VIDEO_FRAME_RATE); film_changed (Film::AUDIO_CHANNELS); film_changed (Film::SEQUENCE_VIDEO); @@ -607,10 +572,8 @@ FilmEditor::set_film (shared_ptr f) film_changed (Film::INTEROP); if (!_film->content().empty ()) { - set_selection (_film->content().front ()); + _content_panel->set_selection (_film->content().front ()); } - - content_selection_changed (); } void @@ -618,41 +581,32 @@ FilmEditor::set_general_sensitivity (bool s) { _generally_sensitive = s; + _content_panel->set_general_sensitivity (s); + /* Stuff in the Content / DCP tabs */ _name->Enable (s); - _use_dci_name->Enable (s); - _edit_dci_button->Enable (s); - _content->Enable (s); - _content_add_file->Enable (s); - _content_add_folder->Enable (s); - _content_remove->Enable (s); - _content_earlier->Enable (s); - _content_later->Enable (s); - _content_timeline->Enable (s); + _use_isdcf_name->Enable (s); + _edit_isdcf_button->Enable (s); _dcp_content_type->Enable (s); bool si = s; if (_film && _film->encrypted ()) { si = false; } + _burn_subtitles->Enable (s); _signed->Enable (si); _encrypted->Enable (s); - _frame_rate->Enable (s); + _frame_rate_choice->Enable (s); + _frame_rate_spin->Enable (s); _audio_channels->Enable (s); _j2k_bandwidth->Enable (s); _container->Enable (s); _best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ()); - _sequence_video->Enable (s); _resolution->Enable (s); _scaler->Enable (s); _three_d->Enable (s); _standard->Enable (s); - - /* Set the panels in the content notebook */ - for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { - (*i)->Enable (s); - } } /** Called when the scaler widget has been changed */ @@ -670,25 +624,25 @@ FilmEditor::scaler_changed () } void -FilmEditor::use_dci_name_toggled () +FilmEditor::use_isdcf_name_toggled () { if (!_film) { return; } - _film->set_use_dci_name (_use_dci_name->GetValue ()); + _film->set_use_isdcf_name (_use_isdcf_name->GetValue ()); } void -FilmEditor::edit_dci_button_clicked () +FilmEditor::edit_isdcf_button_clicked () { if (!_film) { return; } - DCIMetadataDialog* d = new DCIMetadataDialog (this, _film->dci_metadata ()); + ISDCFMetadataDialog* d = new ISDCFMetadataDialog (this, _film->isdcf_metadata ()); d->ShowModal (); - _film->set_dci_metadata (d->dci_metadata ()); + _film->set_isdcf_metadata (d->isdcf_metadata ()); d->Destroy (); } @@ -720,255 +674,6 @@ FilmEditor::best_frame_rate_clicked () _film->set_video_frame_rate (_film->best_video_frame_rate ()); } -void -FilmEditor::setup_content () -{ - string selected_summary; - int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (s != -1) { - selected_summary = wx_to_std (_content->GetItemText (s)); - } - - _content->DeleteAllItems (); - - ContentList content = _film->content (); - for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { - int const t = _content->GetItemCount (); - bool const valid = (*i)->path_valid (); - - string s = (*i)->summary (); - if (!valid) { - s = _("MISSING: ") + s; - } - - _content->InsertItem (t, std_to_wx (s)); - - if ((*i)->summary() == selected_summary) { - _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - } - - if (!valid) { - _content->SetItemTextColour (t, *wxRED); - } - } - - if (selected_summary.empty () && !content.empty ()) { - /* Select the item of content if none was selected before */ - _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - } -} - -void -FilmEditor::content_add_file_clicked () -{ - /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using - non-Latin filenames or paths. - */ - wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE | wxFD_CHANGE_DIR); - int const r = d->ShowModal (); - - if (r != wxID_OK) { - d->Destroy (); - return; - } - - wxArrayString paths; - d->GetPaths (paths); - - /* XXX: check for lots of files here and do something */ - - for (unsigned int i = 0; i < paths.GetCount(); ++i) { - _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i]))); - } - - d->Destroy (); -} - -void -FilmEditor::content_add_folder_clicked () -{ - wxDirDialog* d = new wxDirDialog (this, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST); - int const r = d->ShowModal (); - d->Destroy (); - - if (r != wxID_OK) { - return; - } - - _film->examine_and_add_content ( - shared_ptr ( - new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ()))) - ) - ); -} - -void -FilmEditor::content_remove_clicked () -{ - ContentList c = selected_content (); - if (c.size() == 1) { - _film->remove_content (c.front ()); - } - - content_selection_changed (); -} - -void -FilmEditor::content_selection_changed () -{ - setup_content_sensitivity (); - - for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { - (*i)->content_selection_changed (); - } -} - -/** Set up broad sensitivity based on the type of content that is selected */ -void -FilmEditor::setup_content_sensitivity () -{ - _content_add_file->Enable (_generally_sensitive); - _content_add_folder->Enable (_generally_sensitive); - - ContentList selection = selected_content (); - VideoContentList video_selection = selected_video_content (); - AudioContentList audio_selection = selected_audio_content (); - - _content_remove->Enable (selection.size() == 1 && _generally_sensitive); - _content_earlier->Enable (selection.size() == 1 && _generally_sensitive); - _content_later->Enable (selection.size() == 1 && _generally_sensitive); - _content_timeline->Enable (_generally_sensitive); - - _video_panel->Enable (video_selection.size() > 0 && _generally_sensitive); - _audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive); - _subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast (selection.front()) && _generally_sensitive); - _timing_panel->Enable (selection.size() == 1 && _generally_sensitive); -} - -ContentList -FilmEditor::selected_content () -{ - ContentList sel; - long int s = -1; - while (1) { - s = _content->GetNextItem (s, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (s == -1) { - break; - } - - if (s < int (_film->content().size ())) { - sel.push_back (_film->content()[s]); - } - } - - return sel; -} - -VideoContentList -FilmEditor::selected_video_content () -{ - ContentList c = selected_content (); - VideoContentList vc; - - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr t = dynamic_pointer_cast (*i); - if (t) { - vc.push_back (t); - } - } - - return vc; -} - -AudioContentList -FilmEditor::selected_audio_content () -{ - ContentList c = selected_content (); - AudioContentList ac; - - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr t = dynamic_pointer_cast (*i); - if (t) { - ac.push_back (t); - } - } - - return ac; -} - -SubtitleContentList -FilmEditor::selected_subtitle_content () -{ - ContentList c = selected_content (); - SubtitleContentList sc; - - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr t = dynamic_pointer_cast (*i); - if (t) { - sc.push_back (t); - } - } - - return sc; -} - -FFmpegContentList -FilmEditor::selected_ffmpeg_content () -{ - ContentList c = selected_content (); - FFmpegContentList sc; - - for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { - shared_ptr t = dynamic_pointer_cast (*i); - if (t) { - sc.push_back (t); - } - } - - return sc; -} - -void -FilmEditor::content_timeline_clicked () -{ - if (_timeline_dialog) { - _timeline_dialog->Destroy (); - _timeline_dialog = 0; - } - - _timeline_dialog = new DCPTimelineDialog (this, _film); - _timeline_dialog->Show (); -} - -void -FilmEditor::set_selection (weak_ptr wc) -{ - 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); - } else { - _content->SetItemState (i, 0, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED); - } - } -} - -void -FilmEditor::sequence_video_changed () -{ - if (!_film) { - return; - } - - _film->set_sequence_video (_sequence_video->GetValue ()); -} - -void -FilmEditor::content_right_click (wxListEvent& ev) -{ - _menu.popup (selected_content (), ev.GetPoint ()); -} - void FilmEditor::three_d_changed () { @@ -980,21 +685,22 @@ FilmEditor::three_d_changed () } void -FilmEditor::content_earlier_clicked () +FilmEditor::config_changed () { - ContentList sel = selected_content (); - if (sel.size() == 1) { - _film->move_content_earlier (sel.front ()); - content_selection_changed (); - } + _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); + setup_frame_rate_widget (); } void -FilmEditor::content_later_clicked () +FilmEditor::setup_frame_rate_widget () { - ContentList sel = selected_content (); - if (sel.size() == 1) { - _film->move_content_later (sel.front ()); - content_selection_changed (); + if (Config::instance()->allow_any_dcp_frame_rate ()) { + _frame_rate_choice->Hide (); + _frame_rate_spin->Show (); + } else { + _frame_rate_choice->Show (); + _frame_rate_spin->Hide (); } + + _frame_rate_sizer->Layout (); }