Split audio; builds.

[dcpomatic.git] / src / wx / dcp_panel.cc

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index c8f1c05634b3d02f1158d024870047dc848b67d8..30657f841586dad8c137f7204c9530c84f6353c6 100644 (file)
--- 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;
        }
@@ -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);
 }