Remove some unused bits.

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 94c2ea37a4f45fbde6e016f0894f2b4bd70552b2..31c3c26e496db5d6bc808d0d1c3e266d18d5e9dd 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -76,24 +76,6 @@ using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::scoped_ptr;
 
-static bool
-has_video (Content* c)
-{
-       return static_cast<bool>(c->video);
-}
-
-static bool
-has_audio (Content* c)
-{
-       return static_cast<bool>(c->audio);
-}
-
-static bool
-has_subtitle (Content* c)
-{
-       return static_cast<bool>(c->subtitle);
-}
-
 Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
        : _film (film)
        , _playlist (playlist)

diff --git a/src/lib/player.h b/src/lib/player.h
index c04b3367c69fef28a0a2cfbefd6d80849a5e6d03..95db8756be6f2337aeae147f1dcb07a67070e730 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -93,7 +93,6 @@ 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;