No-op; fix GPL address and use the explicit-program-name version.

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

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 34a22b84448b06d0a03f447ff44b513435c87c4e..66a0842596cd50d1c85ab544ab8e59c6ac3e71c1 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -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 <dcp/key.h>
 #include <dcp/raw_convert.h>
 #include <wx/wx.h>
@@ -177,7 +181,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 (_("Reel|Custom"));
+       /// TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix
+       _reel_type->Append (S_("Reel|Custom"));
 
        _reel_length->SetRange (1, 64);
 
@@ -412,6 +417,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 +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) {
@@ -765,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);
 }