Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index a24059da2d9138d9c1b155ed13bb009f4867769c..457cfe47b1e3de06671b646d7ddaf48926c2f1c8 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -18,68 +18,24 @@
 */
 
 #include "video_decoder.h"
-#include "subtitle.h"
-#include "film.h"
 #include "image.h"
-#include "log.h"
-#include "job.h"
 
 #include "i18n.h"
 
 using std::cout;
 using boost::shared_ptr;
-using boost::optional;
 
 VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
        : Decoder (f)
-       , _video_frame (0)
-       , _last_content_time (0)
+       , _video_position (0)
 {
 
 }
 
-/** Called by subclasses to tell the world that some video data is ready.
- *  We find a subtitle then emit it for listeners.
- *  @param image frame to emit.
- *  @param t Time of the frame within the source, in seconds.
- */
 void
-VideoDecoder::emit_video (shared_ptr<Image> image, bool same, double t)
+VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
 {
-       shared_ptr<Subtitle> sub;
-       if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
-               sub = _timed_subtitle->subtitle ();
-       }
-
-       TIMING (N_("Decoder emits %1"), _video_frame);
-       Video (image, same, sub, t);
-       ++_video_frame;
-
-       _last_content_time = t;
-}
-
-/** Set up the current subtitle.  This will be put onto frames that
- *  fit within its time specification.  s may be 0 to say that there
- *  is no current subtitle.
- *  @param s New current subtitle, or 0.
- */
-void
-VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
-{
-       _timed_subtitle = s;
-       
-       if (_timed_subtitle) {
-               Position const p = _timed_subtitle->subtitle()->position ();
-               _timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top));
-       }
+        Video (image, same, frame);
+       _video_position = frame + 1;
 }
 
-void
-VideoDecoder::set_progress (Job* j) const
-{
-       assert (j);
-
-       if (_film->length()) {
-               j->set_progress (float (_video_frame) / _film->time_to_video_frames (_film->length()));
-       }
-}