diff options
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index f08a23001..c5cf1bdf5 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -54,22 +54,22 @@ public: class FFmpegContent : public Content { public: - FFmpegContent (boost::filesystem::path); - FFmpegContent (cxml::ConstNodePtr, boost::optional<boost::filesystem::path> film_directory, int version, std::list<std::string> &); - FFmpegContent (std::vector<std::shared_ptr<Content>>); + FFmpegContent(boost::filesystem::path); + FFmpegContent(cxml::ConstNodePtr, boost::optional<boost::filesystem::path> film_directory, int version, std::list<std::string> &); + FFmpegContent(std::vector<std::shared_ptr<Content>>); - std::shared_ptr<FFmpegContent> shared_from_this () { - return std::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ()); + std::shared_ptr<FFmpegContent> shared_from_this() { + return std::dynamic_pointer_cast<FFmpegContent>(Content::shared_from_this()); } - std::shared_ptr<const FFmpegContent> shared_from_this () const { - return std::dynamic_pointer_cast<const FFmpegContent> (Content::shared_from_this ()); + std::shared_ptr<const FFmpegContent> shared_from_this() const { + return std::dynamic_pointer_cast<const FFmpegContent>(Content::shared_from_this()); } void examine(std::shared_ptr<const Film> film, std::shared_ptr<Job>, bool tolerant) override; - void take_settings_from (std::shared_ptr<const Content> c) override; - std::string summary () const override; - std::string technical_summary () const override; + void take_settings_from(std::shared_ptr<const Content> c) override; + std::string summary() const override; + std::string technical_summary() const override; void as_xml( xmlpp::Element* element, @@ -78,43 +78,43 @@ public: boost::optional<boost::filesystem::path> film_directory ) const override; - dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override; - dcpomatic::DCPTime approximate_length () const override; + dcpomatic::DCPTime full_length(std::shared_ptr<const Film> film) const override; + dcpomatic::DCPTime approximate_length() const override; - std::string identifier () const override; + std::string identifier() const override; - void set_default_colour_conversion (); + void set_default_colour_conversion(); void set_filters(std::vector<Filter> const&); - std::vector<std::shared_ptr<FFmpegSubtitleStream>> subtitle_streams () const { - boost::mutex::scoped_lock lm (_mutex); + std::vector<std::shared_ptr<FFmpegSubtitleStream>> subtitle_streams() const { + boost::mutex::scoped_lock lm(_mutex); return _subtitle_streams; } - std::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const { - boost::mutex::scoped_lock lm (_mutex); + std::shared_ptr<FFmpegSubtitleStream> subtitle_stream() const { + boost::mutex::scoped_lock lm(_mutex); return _subtitle_stream; } - std::vector<std::shared_ptr<FFmpegAudioStream>> ffmpeg_audio_streams () const; + std::vector<std::shared_ptr<FFmpegAudioStream>> ffmpeg_audio_streams() const; std::vector<Filter> filters() const { - boost::mutex::scoped_lock lm (_mutex); + boost::mutex::scoped_lock lm(_mutex); return _filters; } - void set_subtitle_stream (std::shared_ptr<FFmpegSubtitleStream>); + void set_subtitle_stream(std::shared_ptr<FFmpegSubtitleStream>); - boost::optional<dcpomatic::ContentTime> first_video () const { - boost::mutex::scoped_lock lm (_mutex); + boost::optional<dcpomatic::ContentTime> first_video() const { + boost::mutex::scoped_lock lm(_mutex); return _first_video; } - void signal_subtitle_stream_changed (); + void signal_subtitle_stream_changed(); private: - void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const override; + void add_properties(std::shared_ptr<const Film> film, std::list<UserProperty> &) const override; friend struct ffmpeg_pts_offset_test; friend struct audio_sampling_rate_test; |
