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

[dcpomatic.git] / src / lib / transcoder.cc

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index acff9c8965832a1af81739bffcd6376c38039e83..eb787dee82c52ca3795cb5a145170710e6d1cd85 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -54,7 +55,7 @@ Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
        : _film (film)
        , _player (new Player (film, film->playlist ()))
        , _writer (new Writer (film, j))
-       , _encoder (new Encoder (film, j, _writer))
+       , _encoder (new Encoder (film, _writer))
        , _finishing (false)
 {
 
@@ -72,9 +73,8 @@ Transcoder::go ()
        int burnt_subtitles = 0;
        int non_burnt_subtitles = 0;
        BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
-               shared_ptr<const SubtitleContent> sc = dynamic_pointer_cast<const SubtitleContent> (c);
-               if (sc && sc->use_subtitles()) {
-                       if (sc->burn_subtitles()) {
+               if (c->subtitle && c->subtitle->use()) {
+                       if (c->subtitle->burn()) {
                                ++burnt_subtitles;
                        } else {
                                ++non_burnt_subtitles;
@@ -91,7 +91,7 @@ Transcoder::go ()
                _writer->write (_player->get_audio (t, frame, true));
 
                if (non_burnt_subtitles) {
-                       _writer->write (_player->get_subtitles (t, frame, true, false));
+                       _writer->write (_player->get_subtitles (t, frame, true, false, true));
                }
        }