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

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 49a0a9b13c0a41ab62045445291e53415ac46146..6b3625d9e727d34faec4effa67da7304aa1d832f 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -250,7 +251,7 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
                }
 
                digester.add (i->digest ());
-               digester.add (i->audio->audio_mapping().digest ());
+               digester.add (i->audio->mapping().digest ());
                if (playlist->content().size() != 1) {
                        /* Analyses should be considered equal regardless of gain
                           if they were made from just one piece of content.  This
@@ -258,7 +259,7 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
                           analysis at the plotting stage rather than having to
                           recompute it.
                        */
-                       digester.add (i->audio->audio_gain ());
+                       digester.add (i->audio->gain ());
                }
        }
 
@@ -620,7 +621,7 @@ Film::isdcf_name (bool if_created_now) const
                                if (i->video->scale().ratio ()) {
                                        content_ratio = i->video->scale().ratio ();
                                } else {
-                                       content_ratio = Ratio::from_ratio (i->video->video_size().ratio ());
+                                       content_ratio = Ratio::from_ratio (i->video->size().ratio ());
                                }
                                break;
                        }
@@ -641,7 +642,7 @@ Film::isdcf_name (bool if_created_now) const
                                        continue;
                                }
 
-                               if (i->subtitle->use_subtitles() && !i->subtitle->burn_subtitles()) {
+                               if (i->subtitle->use() && !i->subtitle->burn()) {
                                        burnt_in = false;
                                }
                        }
@@ -887,7 +888,7 @@ Film::signal_changed (Property p)
 
        switch (p) {
        case Film::CONTENT:
-               set_video_frame_rate (_playlist->best_dcp_frame_rate ());
+               set_video_frame_rate (_playlist->best_video_frame_rate ());
                break;
        case Film::VIDEO_FRAME_RATE:
        case Film::SEQUENCE:
@@ -1082,7 +1083,7 @@ Film::length () const
 int
 Film::best_video_frame_rate () const
 {
-       return _playlist->best_dcp_frame_rate ();
+       return _playlist->best_video_frame_rate ();
 }
 
 FrameRateChange
@@ -1096,9 +1097,9 @@ Film::playlist_content_changed (weak_ptr<Content> c, int p, bool frequent)
 {
        _dirty = true;
 
-       if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
-               set_video_frame_rate (_playlist->best_dcp_frame_rate ());
-       } else if (p == AudioContentProperty::AUDIO_STREAMS) {
+       if (p == ContentProperty::VIDEO_FRAME_RATE) {
+               set_video_frame_rate (_playlist->best_video_frame_rate ());
+       } else if (p == AudioContentProperty::STREAMS) {
                signal_changed (NAME);
        }
 
@@ -1268,7 +1269,7 @@ Film::subtitle_language () const
        ContentList cl = content ();
        BOOST_FOREACH (shared_ptr<Content>& c, cl) {
                if (c->subtitle) {
-                       languages.insert (c->subtitle->subtitle_language ());
+                       languages.insert (c->subtitle->language ());
                }
        }