Fix thinko in video signalling.
authorCarl Hetherington <cth@carlh.net>
Thu, 15 Nov 2012 20:27:44 +0000 (20:27 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 15 Nov 2012 20:27:44 +0000 (20:27 +0000)
src/lib/decoder.cc
src/lib/decoder.h

index 8e1e4e3c59e791abe2fa494e05fe2b7f207620ae..8d087b6ee00c338413948d5f6b499d132a15775e 100644 (file)
@@ -74,7 +74,7 @@ Decoder::go ()
 }
 
 /** Called by subclasses to tell the world that some video data is ready.
- *  We do some post-processing / filtering then emit it for listeners.
+ *  We find a subtitle then emit it for listeners.
  *  @param frame to decode; caller manages memory.
  */
 void
@@ -85,7 +85,7 @@ Decoder::emit_video (shared_ptr<Image> image)
                sub = _timed_subtitle->subtitle ();
        }
 
-       Video (image, sub);
+       signal_video (image, sub);
 }
 
 void
@@ -96,11 +96,11 @@ Decoder::repeat_last_video ()
                _last_image->make_black ();
        }
 
-       emit_video (_last_image, _last_subtitle);
+       signal_video (_last_image, _last_subtitle);
 }
 
 void
-Decoder::emit_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
+Decoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
 {
        TIMING ("Decoder emits %1", _video_frame);
        Video (image, sub);
index 5bb5b574d5038d7b6686489ca0d5c688d17b1db2..805f6e521326bd9902f8b6bcace5495f7335fdcb 100644 (file)
@@ -117,7 +117,7 @@ protected:
        std::vector<SubtitleStream> _subtitle_streams;
        
 private:
-       void emit_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+       void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
 
        SourceFrame _video_frame;