projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Primitive subtitle export feature.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 79ad0ab4427b7cf6eb98c3fa7d797aade01be38b..792029a9164f0ea4ce30054af0496501e113ea49 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-22,8
+22,9
@@
#define DCPOMATIC_ENCODER_H
#include "types.h"
#define DCPOMATIC_ENCODER_H
#include "types.h"
-#include "player_
subtitles
.h"
+#include "player_
text
.h"
#include <boost/weak_ptr.hpp>
#include <boost/weak_ptr.hpp>
+#include <boost/signals2.hpp>
class Film;
class Encoder;
class Film;
class Encoder;
@@
-42,16
+43,15
@@
public:
virtual void go () = 0;
/** @return the current frame rate over the last short while */
virtual void go () = 0;
/** @return the current frame rate over the last short while */
- virtual float current_rate () const = 0;
+ virtual boost::optional<float> current_rate () const {
+ return boost::optional<float>();
+ }
+
/** @return the number of frames that are done */
virtual Frame frames_done () const = 0;
virtual bool finishing () const = 0;
protected:
/** @return the number of frames that are done */
virtual Frame frames_done () const = 0;
virtual bool finishing () const = 0;
protected:
- virtual void video (boost::shared_ptr<PlayerVideo>, DCPTime) = 0;
- virtual void audio (boost::shared_ptr<AudioBuffers>, DCPTime) = 0;
- virtual void subtitle (PlayerSubtitles, DCPTimePeriod) = 0;
-
boost::shared_ptr<const Film> _film;
boost::weak_ptr<Job> _job;
boost::shared_ptr<Player> _player;
boost::shared_ptr<const Film> _film;
boost::weak_ptr<Job> _job;
boost::shared_ptr<Player> _player;