X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=66a0842596cd50d1c85ab544ab8e59c6ac3e71c1;hp=3f4327cf8ffb837a8ddad07c6d1440bdc1d859d1;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=1ca0d61534209e4679cead26e0df1886704a3ef8 diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 3f4327cf8..66a084259 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - 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 . */ @@ -29,7 +30,10 @@ #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/audio_processor.h" +#include "lib/video_content.h" +#include "lib/subtitle_content.h" #include "lib/dcp_content.h" +#include "lib/audio_content.h" #include #include #include @@ -153,17 +157,22 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); ++r; - _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::name_changed, this)); - _use_isdcf_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::use_isdcf_name_toggled, this)); - _edit_isdcf_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this)); - _copy_isdcf_name_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this)); - _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::dcp_content_type_changed, this)); - _signed->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::signed_toggled, this)); - _encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::encrypted_toggled, this)); - _edit_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_key_clicked, this)); - _reel_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::reel_type_changed, this)); - _reel_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::reel_length_changed, this)); - _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::standard_changed, this)); + _upload_after_make_dcp = new wxCheckBox (_panel, wxID_ANY, _("Upload DCP to TMS after it is made")); + grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + + _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::name_changed, this)); + _use_isdcf_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::use_isdcf_name_toggled, this)); + _edit_isdcf_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this)); + _copy_isdcf_name_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this)); + _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::dcp_content_type_changed, this)); + _signed->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::signed_toggled, this)); + _encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::encrypted_toggled, this)); + _edit_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_key_clicked, this)); + _reel_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::reel_type_changed, this)); + _reel_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::reel_length_changed, this)); + _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::standard_changed, this)); + _upload_after_make_dcp->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::upload_after_make_dcp_changed, this)); vector const ct = DCPContentType::all (); for (vector::const_iterator i = ct.begin(); i != ct.end(); ++i) { @@ -172,7 +181,8 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) _reel_type->Append (_("Single reel")); _reel_type->Append (_("Split by video content")); - _reel_type->Append (_("Custom")); + /// TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix + _reel_type->Append (S_("Reel|Custom")); _reel_length->SetRange (1, 64); @@ -288,6 +298,16 @@ DCPPanel::standard_changed () _film->set_interop (_standard->GetSelection() == 1); } +void +DCPPanel::upload_after_make_dcp_changed () +{ + if (!_film) { + return; + } + + _film->set_upload_after_make_dcp (_upload_after_make_dcp->GetValue ()); +} + void DCPPanel::film_changed (int p) { @@ -394,6 +414,12 @@ DCPPanel::film_changed (int p) case Film::REEL_LENGTH: checked_set (_reel_length, _film->reel_length() / 1000000000LL); break; + case Film::UPLOAD_AFTER_MAKE_DCP: + checked_set (_upload_after_make_dcp, _film->upload_after_make_dcp ()); + break; + case Film::CONTENT: + setup_dcp_name (); + break; default: break; } @@ -402,10 +428,10 @@ DCPPanel::film_changed (int p) void DCPPanel::film_content_changed (int property) { - if (property == AudioContentProperty::AUDIO_STREAMS || - property == SubtitleContentProperty::USE_SUBTITLES || - property == SubtitleContentProperty::BURN_SUBTITLES || - property == VideoContentProperty::VIDEO_SCALE || + if (property == AudioContentProperty::STREAMS || + property == SubtitleContentProperty::USE || + property == SubtitleContentProperty::BURN || + property == VideoContentProperty::SCALE || property == DCPContentProperty::REFERENCE_VIDEO || property == DCPContentProperty::REFERENCE_AUDIO || property == DCPContentProperty::REFERENCE_SUBTITLE) { @@ -485,12 +511,13 @@ DCPPanel::set_film (shared_ptr film) film_changed (Film::ISDCF_METADATA); film_changed (Film::VIDEO_FRAME_RATE); film_changed (Film::AUDIO_CHANNELS); - film_changed (Film::SEQUENCE_VIDEO); + film_changed (Film::SEQUENCE); film_changed (Film::THREE_D); film_changed (Film::INTEROP); film_changed (Film::AUDIO_PROCESSOR); film_changed (Film::REEL_TYPE); film_changed (Film::REEL_LENGTH); + film_changed (Film::UPLOAD_AFTER_MAKE_DCP); } void @@ -513,6 +540,7 @@ DCPPanel::set_general_sensitivity (bool s) _edit_key->Enable (s && _film && _film->encrypted ()); _reel_type->Enable (s); _reel_length->Enable (s && _film && _film->reel_type() == REELTYPE_BY_LENGTH); + _upload_after_make_dcp->Enable (s); _frame_rate_choice->Enable (s); _frame_rate_spin->Enable (s); _audio_channels->Enable (s); @@ -745,7 +773,7 @@ DCPPanel::make_audio_panel () void DCPPanel::copy_isdcf_name_button_clicked () { - _film->set_name (_film->isdcf_name (false)); + _film->set_name (_film->isdcf_name (true)); _film->set_use_isdcf_name (false); }