X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=30657f841586dad8c137f7204c9530c84f6353c6;hb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;hp=c46dcba18e4333e5acb6e12061db9a3660aa9deb;hpb=a64cb8ed1cf56f6c5e85560380d8a1f942b01ecd;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index c46dcba18..30657f841 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -29,7 +29,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 <dcp/key.h>
 #include <dcp/raw_convert.h>
 #include <wx/wx.h>
@@ -177,7 +180,8 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> 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 (_("Reel|Custom"));
 
 	_reel_length->SetRange (1, 64);
 
@@ -412,6 +416,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;
 	}
@@ -503,7 +510,7 @@ DCPPanel::set_film (shared_ptr<Film> 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);
@@ -765,7 +772,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);
 }