projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic and slightly inaccurate support for <Space> in subtitles (#2103).
[dcpomatic.git]
/
src
/
lib
/
encoder.cc
diff --git
a/src/lib/encoder.cc
b/src/lib/encoder.cc
index fd826deb6666320ee33be0d0f6591cef9b0b5b10..1d688c31868d49450140e7381994f3431fe6bb5d 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-18,6
+18,7
@@
*/
*/
+
/** @file src/encoder.cc
* @brief A class which takes a Film and some Options, then uses those to encode the film
* into some output format.
/** @file src/encoder.cc
* @brief A class which takes a Film and some Options, then uses those to encode the film
* into some output format.
@@
-26,22
+27,21
@@
* as a parameter to the constructor.
*/
* as a parameter to the constructor.
*/
+
#include "encoder.h"
#include "player.h"
#include "i18n.h"
#include "encoder.h"
#include "player.h"
#include "i18n.h"
-using std::weak_ptr;
-using std::shared_ptr;
/** Construct an encoder.
* @param film Film that we are encoding.
* @param job Job that this encoder is being used in.
*/
/** Construct an encoder.
* @param film Film that we are encoding.
* @param job Job that this encoder is being used in.
*/
-Encoder::Encoder (s
hared_ptr<const Film> film,
weak_ptr<Job> job)
+Encoder::Encoder (s
td::shared_ptr<const Film> film, std::
weak_ptr<Job> job)
: _film (film)
, _job (job)
: _film (film)
, _job (job)
- , _player (new Player(film))
+ , _player (new Player(film
, Image::Alignment::PADDED
))
{
}
{
}