projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested merge of master.
[dcpomatic.git]
/
src
/
lib
/
video_decoder.h
diff --git
a/src/lib/video_decoder.h
b/src/lib/video_decoder.h
index c04874342c07846f81d69ad9f02797165b3977b3..0b05b2f7143690237754d810d8557d8e80cb9d77 100644
(file)
--- a/
src/lib/video_decoder.h
+++ b/
src/lib/video_decoder.h
@@
-17,15
+17,15
@@
*/
*/
-#ifndef D
VD
OMATIC_VIDEO_DECODER_H
-#define D
VD
OMATIC_VIDEO_DECODER_H
+#ifndef D
CP
OMATIC_VIDEO_DECODER_H
+#define D
CP
OMATIC_VIDEO_DECODER_H
#include "video_source.h"
#include "decoder.h"
class VideoContent;
#include "video_source.h"
#include "decoder.h"
class VideoContent;
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public
Timed
VideoSource, public virtual Decoder
{
public:
VideoDecoder (boost::shared_ptr<const Film>);
{
public:
VideoDecoder (boost::shared_ptr<const Film>);
@@
-48,29
+48,22
@@
public:
return _video_frame;
}
return _video_frame;
}
- double last_
source
_time () const {
- return _last_
source
_time;
+ double last_
content
_time () const {
+ return _last_
content
_time;
}
protected:
virtual PixelFormat pixel_format () const = 0;
}
protected:
virtual PixelFormat pixel_format () const = 0;
- void emit_video (boost::shared_ptr<Image>, double);
+ void emit_video (boost::shared_ptr<Image>,
bool,
double);
void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
- bool have_last_video () const;
- void repeat_last_video (double);
private:
private:
- void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
-
int _video_frame;
int _video_frame;
- double _last_
source
_time;
+ double _last_
content
_time;
boost::shared_ptr<TimedSubtitle> _timed_subtitle;
boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
- boost::shared_ptr<Image> _last_image;
- boost::shared_ptr<Subtitle> _last_subtitle;
};
#endif
};
#endif