Remove old unused stuff.

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index e81fbb24ec5ea4d43544222b963054fecb144d13..f530de0ebaeb89adff237391624b337afdc7531a 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -56,8 +56,6 @@ public:
 
        /* Methods to query our input video */
 
-       /** @return length in video frames */
-       virtual int length_in_frames () const = 0;
        /** @return video frames per second, or 0 if unknown */
        virtual float frames_per_second () const = 0;
        /** @return native size in pixels */

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 5eb32a0147f14e2d277474f6fe46c8fbbaf650ee..e2aa8add061a3973e00e742ab994be22181c12dd 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -323,12 +323,6 @@ FFmpegDecoder::do_pass ()
        return false;
 }
 
-int
-FFmpegDecoder::length_in_frames () const
-{
-       return (_format_context->duration / AV_TIME_BASE) * frames_per_second ();
-}
-
 float
 FFmpegDecoder::frames_per_second () const
 {

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 29e06c7d41244ba4a8e7d5a6bdd5385813a94e3a..26b5d69792f42084d8b72cbad9c6cac5415e6282 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -57,8 +57,6 @@ public:
        ~FFmpegDecoder ();
 
        /* Methods to query our input video */
-       int length_in_frames () const;
-       int decoding_frames () const;
        float frames_per_second () const;
        Size native_size () const;
        int audio_channels () const;

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 809f3aecdb61ce6d6cb24fd7f933ebbf4abbd7a2..3e58e645fca46b4692135f64aafc122e750f2c48 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -28,10 +28,6 @@ class ImageMagickDecoder : public Decoder
 public:
        ImageMagickDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
 
-       int length_in_frames () const {
-               return 1;
-       }
-
        float frames_per_second () const {
                return static_frames_per_second ();
        }

diff --git a/src/lib/tiff_decoder.cc b/src/lib/tiff_decoder.cc
index 27dd0d69c79203dbceabe3ddfa5a67aed6e8ea60..51c0b60d1d09c1cac9de3b4fea8857b981644ecf 100644 (file)
--- a/src/lib/tiff_decoder.cc
+++ b/src/lib/tiff_decoder.cc
@@ -78,12 +78,6 @@ TIFFDecoder::TIFFDecoder (boost::shared_ptr<const FilmState> fs, boost::shared_p
 
 }
 
-int
-TIFFDecoder::length_in_frames () const
-{
-       return _files.size ();
-}
-
 float
 TIFFDecoder::frames_per_second () const
 {

diff --git a/src/lib/tiff_decoder.h b/src/lib/tiff_decoder.h
index b9849a2591f7af04b4396b9932c93c52c02c6b4d..07174889dd93a556302c817154777bfe77f069b7 100644 (file)
--- a/src/lib/tiff_decoder.h
+++ b/src/lib/tiff_decoder.h
@@ -46,7 +46,6 @@ public:
        TIFFDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
 
        /* Methods to query our input video */
-       int length_in_frames () const;
        float frames_per_second () const;
        Size native_size () const;
        int audio_channels () const;