X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=7d1d2497a3eaca2d5be5d3eeb41e54fb3e4937c3;hb=1264ba2b6a9d2f5a0534da6cac9358144ca1f426;hp=c46dcba18e4333e5acb6e12061db9a3660aa9deb;hpb=a64cb8ed1cf56f6c5e85560380d8a1f942b01ecd;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index c46dcba18..7d1d2497a 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,9 +30,12 @@ #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 #include #include #include @@ -49,6 +53,7 @@ using std::max; using std::make_pair; using boost::lexical_cast; using boost::shared_ptr; +using dcp::locale_convert; DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) : _audio_dialog (0) @@ -177,7 +182,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); @@ -270,7 +276,7 @@ DCPPanel::audio_channels_changed () return; } - _film->set_audio_channels (dcp::raw_convert (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ())))); + _film->set_audio_channels (locale_convert (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ())))); } void @@ -381,7 +387,7 @@ DCPPanel::film_changed (int p) if (_film->audio_channels () < minimum_allowed_audio_channels ()) { _film->set_audio_channels (minimum_allowed_audio_channels ()); } else { - checked_set (_audio_channels, dcp::raw_convert (max (minimum_allowed_audio_channels(), _film->audio_channels ()))); + checked_set (_audio_channels, locale_convert (max (minimum_allowed_audio_channels(), _film->audio_channels ()))); setup_dcp_name (); } break; @@ -399,7 +405,7 @@ DCPPanel::film_changed (int p) } else { checked_set (_audio_processor, 0); } - setup_audio_channels_choice (); + setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); film_changed (Film::AUDIO_CHANNELS); break; case Film::REEL_TYPE: @@ -412,6 +418,9 @@ DCPPanel::film_changed (int p) 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; } @@ -420,10 +429,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) { @@ -488,6 +497,12 @@ DCPPanel::dcp_content_type_changed () void DCPPanel::set_film (shared_ptr film) { + /* We are changing film, so destroy any audio dialog for the old one */ + if (_audio_dialog) { + _audio_dialog->Destroy (); + _audio_dialog = 0; + } + _film = film; film_changed (Film::NAME); @@ -503,7 +518,7 @@ 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); @@ -572,6 +587,7 @@ void DCPPanel::setup_dcp_name () { _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true))); + _dcp_name->SetToolTip (std_to_wx (_film->dcp_name (true))); } void @@ -661,7 +677,7 @@ DCPPanel::make_video_panel () ++r; { - add_label_to_sizer (grid, panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true, wxGBPosition (r, 0)); wxSizer* s = new wxBoxSizer (wxHORIZONTAL); _j2k_bandwidth = new wxSpinCtrl (panel, wxID_ANY); s->Add (_j2k_bandwidth, 1); @@ -714,17 +730,6 @@ DCPPanel::minimum_allowed_audio_channels () const return min; } -void -DCPPanel::setup_audio_channels_choice () -{ - vector > items; - for (int i = minimum_allowed_audio_channels(); i <= 16; i += 2) { - items.push_back (make_pair (dcp::raw_convert (i), dcp::raw_convert (i))); - } - - checked_set (_audio_channels, items); -} - wxPanel * DCPPanel::make_audio_panel () { @@ -738,7 +743,7 @@ DCPPanel::make_audio_panel () add_label_to_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0)); _audio_channels = new wxChoice (panel, wxID_ANY); - setup_audio_channels_choice (); + setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); grid->Add (_audio_channels, wxGBPosition (r, 1)); ++r; @@ -765,7 +770,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); }