diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/atmos_decoder.cc | 14 | ||||
| -rw-r--r-- | src/lib/atmos_decoder.h | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/atmos_decoder.cc b/src/lib/atmos_decoder.cc index 478c45809..e2dd01c38 100644 --- a/src/lib/atmos_decoder.cc +++ b/src/lib/atmos_decoder.cc @@ -30,25 +30,25 @@ using std::shared_ptr; -AtmosDecoder::AtmosDecoder (Decoder* parent, shared_ptr<const Content> content) - : DecoderPart (parent) - , _content (content) +AtmosDecoder::AtmosDecoder(Decoder* parent, shared_ptr<const Content> content) + : DecoderPart(parent) + , _content(content) { } void -AtmosDecoder::seek () +AtmosDecoder::seek() { _position = boost::none; } void -AtmosDecoder::emit (shared_ptr<const Film> film, shared_ptr<const dcp::AtmosFrame> data, Frame frame, AtmosMetadata metadata) +AtmosDecoder::emit(shared_ptr<const Film> film, shared_ptr<const dcp::AtmosFrame> data, Frame frame, AtmosMetadata metadata) { - Data (ContentAtmos(data, frame, metadata)); + Data(ContentAtmos(data, frame, metadata)); /* There's no fiddling with frame rates when we are using Atmos; the DCP rate must be the same as the Atmos one */ - _position = dcpomatic::ContentTime::from_frames (frame, film->video_frame_rate()); + _position = dcpomatic::ContentTime::from_frames(frame, film->video_frame_rate()); } diff --git a/src/lib/atmos_decoder.h b/src/lib/atmos_decoder.h index 1ec1b8a6c..0dbeedebc 100644 --- a/src/lib/atmos_decoder.h +++ b/src/lib/atmos_decoder.h @@ -28,15 +28,15 @@ class AtmosDecoder : public DecoderPart { public: - AtmosDecoder (Decoder* parent, std::shared_ptr<const Content> content); + AtmosDecoder(Decoder* parent, std::shared_ptr<const Content> content); - boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override { + boost::optional<dcpomatic::ContentTime> position(std::shared_ptr<const Film>) const override { return _position; } - void seek () override; + void seek() override; - void emit (std::shared_ptr<const Film> film, std::shared_ptr<const dcp::AtmosFrame> data, Frame frame, AtmosMetadata metadata); + void emit(std::shared_ptr<const Film> film, std::shared_ptr<const dcp::AtmosFrame> data, Frame frame, AtmosMetadata metadata); boost::signals2::signal<void (ContentAtmos)> Data; |