/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
#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 <dcp/key.h>
#include <dcp/raw_convert.h>
#include <wx/wx.h>
_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);
} 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:
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;
}
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) {
void
DCPPanel::set_film (shared_ptr<Film> 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);
return min;
}
-void
-DCPPanel::setup_audio_channels_choice ()
-{
- vector<pair<string, string> > items;
- for (int i = minimum_allowed_audio_channels(); i <= 16; i += 2) {
- items.push_back (make_pair (dcp::raw_convert<string> (i), dcp::raw_convert<string> (i)));
- }
-
- checked_set (_audio_channels, items);
-}
-
wxPanel *
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;
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);
}