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

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index f03f8a9a1747eb7fcd061c2c4f078ce93a598ec5..ab78fe0c463f0a2a662129757b61adac8b7ad5a5 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -1,26 +1,26 @@
 /*
     Copyright (C) 2013-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/>.
 
 */
 
 #include "playlist.h"
-#include "sndfile_content.h"
-#include "sndfile_decoder.h"
 #include "video_content.h"
+#include "subtitle_content.h"
 #include "ffmpeg_decoder.h"
 #include "ffmpeg_content.h"
 #include "image_decoder.h"
@@ -66,7 +66,7 @@ Playlist::~Playlist ()
 void
 Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
-       if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
+       if (property == ContentProperty::LENGTH || property == VideoContentProperty::FRAME_TYPE) {
                /* Don't respond to position changes here, as:
                   - sequencing after earlier/later changes is handled by move_earlier/move_later
                   - any other position changes will be timeline drags which should not result in content
@@ -114,7 +114,7 @@ Playlist::maybe_sequence ()
                        continue;
                }
 
-               if (i->video->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+               if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
                        i->set_position (next_right);
                        next_right = i->end();
                } else {
@@ -129,13 +129,12 @@ Playlist::maybe_sequence ()
 
        DCPTime next;
        BOOST_FOREACH (shared_ptr<Content> i, _content) {
-               shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (i);
-               if (!sc || !sc->has_subtitles() || find (placed.begin(), placed.end(), i) != placed.end()) {
+               if (!i->subtitle || find (placed.begin(), placed.end(), i) != placed.end()) {
                        continue;
                }
 
-               sc->set_position (next);
-               next = sc->end();
+               i->set_position (next);
+               next = i->end();
        }
 
 
@@ -150,12 +149,8 @@ Playlist::video_identifier () const
        string t;
 
        BOOST_FOREACH (shared_ptr<const Content> i, _content) {
-               shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (i);
-               shared_ptr<const SubtitleContent> sc = dynamic_pointer_cast<const SubtitleContent> (i);
-               if (vc) {
-                       t += vc->identifier ();
-               } else if (sc && sc->burn_subtitles ()) {
-                       t += sc->identifier ();
+               if (i->video || (i->subtitle && i->subtitle->burn())) {
+                       t += i->identifier ();
                }
        }
 
@@ -244,7 +239,7 @@ public:
 };
 
 int
-Playlist::best_dcp_frame_rate () const
+Playlist::best_video_frame_rate () const
 {
        list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
 
@@ -270,14 +265,14 @@ Playlist::best_dcp_frame_rate () const
 
                float this_error = 0;
                BOOST_FOREACH (shared_ptr<Content> j, _content) {
-                       if (!j->video || !j->video->has_own_video_frame_rate()) {
+                       if (!j->video || !j->video_frame_rate()) {
                                continue;
                        }
 
                        /* Best error for this content; we could use the content as-is or double its rate */
                        float best_error = min (
-                               float (fabs (i->source - j->video->video_frame_rate ())),
-                               float (fabs (i->source - j->video->video_frame_rate () * 2))
+                               float (fabs (i->source - j->video_frame_rate().get())),
+                               float (fabs (i->source - j->video_frame_rate().get() * 2))
                                );
 
                        /* Use the largest difference between DCP and source as the "error" */
@@ -346,7 +341,7 @@ Playlist::video_end () const
 {
        DCPTime end;
        BOOST_FOREACH (shared_ptr<Content> i, _content) {
-               if (dynamic_pointer_cast<const VideoContent> (i)) {
+               if (i->video) {
                        end = max (end, i->end ());
                }
        }
@@ -359,7 +354,7 @@ Playlist::subtitle_end () const
 {
        DCPTime end;
        BOOST_FOREACH (shared_ptr<Content> i, _content) {
-               if (dynamic_pointer_cast<const SubtitleContent> (i)) {
+               if (i->subtitle) {
                        end = max (end, i->end ());
                }
        }
@@ -379,7 +374,13 @@ Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const
                        /* This is the first piece of content (going backwards...) that starts before t,
                           so it's the active one.
                        */
-                       return FrameRateChange ((*i)->video->video_frame_rate(), dcp_video_frame_rate);
+                       if ((*i)->video_frame_rate ()) {
+                               /* This content specified a rate, so use it */
+                               return FrameRateChange ((*i)->video_frame_rate().get(), dcp_video_frame_rate);
+                       } else {
+                               /* No specified rate so just use the DCP one */
+                               return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate);
+                       }
                }
        }