Remove some unused bits.

[dcpomatic.git] / src / lib / player.h

diff --git a/src/lib/player.h b/src/lib/player.h
index bfb21abba515c3e0fed011b006e7adc8fa0a14cd..95db8756be6f2337aeae147f1dcb07a67070e730 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-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/>.
 
 */
 
@@ -25,6 +26,11 @@
 #include "content.h"
 #include "position_image.h"
 #include "piece.h"
+#include "content_video.h"
+#include "content_audio.h"
+#include "content_subtitle.h"
+#include "audio_stream.h"
+#include "audio_merger.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <list>
@@ -47,9 +53,9 @@ class Player : public boost::enable_shared_from_this<Player>, public boost::nonc
 public:
        Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> playlist);
 
-       std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate);
-       boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
-       PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, bool accurate);
+       bool pass ();
+       void seek (DCPTime time, bool accurate);
+
        std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
        std::list<ReferencedReelAsset> get_reel_assets ();
 
@@ -69,6 +75,10 @@ public:
         */
        boost::signals2::signal<void (bool)> Changed;
 
+       boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>)> Video;
+       boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio;
+       boost::signals2::signal<void (PlayerSubtitles)> Subtitle;
+
 private:
        friend class PlayerWrapper;
        friend class Piece;
@@ -83,36 +93,18 @@ private:
        void playlist_changed ();
        void playlist_content_changed (boost::weak_ptr<Content>, int, bool);
        std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const;
-       void update_subtitle_from_text ();
        Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
        Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-       ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-       DCPTime content_subtitle_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const;
+       DCPTime resampled_audio_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
+       ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, DCPTime t) const;
+       DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const;
        boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const;
-
-       /** @return Pieces of content type C that overlap a specified time range in the DCP */
-       template<class C>
-       std::list<boost::shared_ptr<Piece> >
-       overlaps (DCPTime from, DCPTime to)
-       {
-               if (!_have_valid_pieces) {
-                       setup_pieces ();
-               }
-
-               std::list<boost::shared_ptr<Piece> > overlaps;
-               for (typename std::list<boost::shared_ptr<Piece> >::const_iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-                       if (!boost::dynamic_pointer_cast<C> ((*i)->content)) {
-                               continue;
-                       }
-
-                       if ((*i)->content->position() < to && (*i)->content->end() > from) {
-                               overlaps.push_back (*i);
-                       }
-               }
-
-               return overlaps;
-       }
+       std::list<boost::shared_ptr<Piece> > overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid);
+       void video (boost::weak_ptr<Piece>, ContentVideo);
+       void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
+       void image_subtitle (boost::weak_ptr<Piece>, ContentImageSubtitle);
+       void text_subtitle (boost::weak_ptr<Piece>, ContentTextSubtitle);
 
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<const Playlist> _playlist;
@@ -138,6 +130,14 @@ private:
        /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
        bool _play_referenced;
 
+       boost::shared_ptr<PlayerVideo> _last_video;
+       boost::optional<DCPTime> _last_video_time;
+
+       AudioMerger _audio_merger;
+       DCPTime _last_audio_time;
+
+       std::list<PlayerSubtitles> _subtitles;
+
        boost::shared_ptr<AudioProcessor> _audio_processor;
 
        boost::signals2::scoped_connection _film_changed_connection;