diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-10 15:47:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-10 15:47:06 +0100 |
| commit | cc4a67b7eb8ecaed076e261960848f70e3e741af (patch) | |
| tree | a41a122341543aee630d6842785d90830298a297 /src/lib/decoder.h | |
| parent | d382f34db155ddaf4bb61538c18b87c7564e00b2 (diff) | |
Subs successfully exported with thumbs.
Diffstat (limited to 'src/lib/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 9a4c7695e..5cb44b8d9 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -37,6 +37,7 @@ class Options; class Image; class Log; class DelayLine; +class Subtitle; /** @class Decoder. * @brief Parent class for decoders of content. @@ -81,8 +82,9 @@ public: /** Emitted when a video frame is ready. * First parameter is the frame. * Second parameter is its index within the content. + * Third parameter is either 0 or a subtitle that should be on this frame. */ - sigc::signal<void, boost::shared_ptr<Image>, int> Video; + sigc::signal<void, boost::shared_ptr<Image>, int, boost::shared_ptr<Subtitle> > Video; /** Emitted when some audio data is ready. * First parameter is the interleaved sample data, format is given in the FilmState. @@ -98,9 +100,8 @@ protected: virtual int time_base_denominator () const = 0; virtual int sample_aspect_ratio_numerator () const = 0; virtual int sample_aspect_ratio_denominator () const = 0; - virtual void overlay (boost::shared_ptr<Image> image) const {} - void process_video (AVFrame *); + void process_video (AVFrame *, boost::shared_ptr<Subtitle>); void process_audio (uint8_t *, int); /** our FilmState */ |