From e8819ad7580f25eea7ca3c59cf0a3979d76a6b44 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 23 May 2013 08:07:38 +0100 Subject: Some more tidying up. --- src/lib/ffmpeg_decoder.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/lib/ffmpeg_decoder.h') diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 3b629e3ae..dbcfe3be0 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -62,16 +62,22 @@ public: FFmpegDecoder (boost::shared_ptr, boost::shared_ptr, bool video, bool audio, bool subtitles); ~FFmpegDecoder (); - bool pass (); - bool seek (Time); - bool seek_back (); - bool seek_forward (); + /* Decoder */ + + void pass (); + void seek (Time); + void seek_back (); + void seek_forward (); Time next () const; + /* VideoDecoder */ + float video_frame_rate () const; - libdcp::Size native_size () const; + libdcp::Size video_size () const; ContentVideoFrame video_length () const; + /* FFmpegDecoder */ + std::vector > subtitle_streams () const { return _subtitle_streams; } @@ -93,7 +99,7 @@ private: PixelFormat pixel_format () const; AVSampleFormat audio_sample_format () const; int bytes_per_audio_sample () const; - bool do_seek (Time, bool, bool); + void do_seek (Time, bool, bool); void setup_general (); void setup_video (); -- cgit v1.2.3