projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.h
diff --git
a/src/lib/ffmpeg_content.h
b/src/lib/ffmpeg_content.h
index b7685bf0937c56f92b1cfea4e65aea1c2f114785..df7b56edca41e9ecd5475c2f0a9658f1a1b855e5 100644
(file)
--- a/
src/lib/ffmpeg_content.h
+++ b/
src/lib/ffmpeg_content.h
@@
-41,6
+41,7
@@
public:
/** The chosen subtitle stream, or something about it */
static int const SUBTITLE_STREAM;
static int const FILTERS;
/** The chosen subtitle stream, or something about it */
static int const SUBTITLE_STREAM;
static int const FILTERS;
+ static int const KDM;
};
class FFmpegContent : public Content
};
class FFmpegContent : public Content
@@
-48,22
+49,23
@@
class FFmpegContent : public Content
public:
FFmpegContent (boost::filesystem::path);
FFmpegContent (cxml::ConstNodePtr, int version, std::list<std::string> &);
public:
FFmpegContent (boost::filesystem::path);
FFmpegContent (cxml::ConstNodePtr, int version, std::list<std::string> &);
- FFmpegContent (std::vector<
boost::shared_ptr<Content>
>);
+ FFmpegContent (std::vector<
std::shared_ptr<Content>
>);
-
boost
::shared_ptr<FFmpegContent> shared_from_this () {
- return
boost
::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 ());
}
}
-
boost
::shared_ptr<const FFmpegContent> shared_from_this () const {
- return
boost
::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 (
boost::shared_ptr<const Film> film, boost
::shared_ptr<Job>);
- void take_settings_from (
boost
::shared_ptr<const Content> c);
+ void examine (
std::shared_ptr<const Film> film, std
::shared_ptr<Job>);
+ void take_settings_from (
std
::shared_ptr<const Content> c);
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *, bool with_paths) const;
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *, bool with_paths) const;
- DCPTime full_length (boost::shared_ptr<const Film> film) const;
+ dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
+ dcpomatic::DCPTime approximate_length () const;
std::string identifier () const;
std::string identifier () const;
@@
-71,51
+73,41
@@
public:
void set_filters (std::vector<Filter const *> const &);
void set_filters (std::vector<Filter const *> const &);
- std::vector<
boost::shared_ptr<FFmpegSubtitleStream>
> subtitle_streams () const {
+ std::vector<
std::shared_ptr<FFmpegSubtitleStream>
> subtitle_streams () const {
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_streams;
}
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_streams;
}
-
boost
::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const {
+
std
::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const {
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_stream;
}
boost::mutex::scoped_lock lm (_mutex);
return _subtitle_stream;
}
- std::vector<
boost::shared_ptr<FFmpegAudioStream>
> ffmpeg_audio_streams () const;
+ std::vector<
std::shared_ptr<FFmpegAudioStream>
> ffmpeg_audio_streams () const;
std::vector<Filter const *> filters () const {
boost::mutex::scoped_lock lm (_mutex);
return _filters;
}
std::vector<Filter const *> filters () const {
boost::mutex::scoped_lock lm (_mutex);
return _filters;
}
- void set_subtitle_stream (
boost
::shared_ptr<FFmpegSubtitleStream>);
+ void set_subtitle_stream (
std
::shared_ptr<FFmpegSubtitleStream>);
- boost::optional<ContentTime> first_video () const {
+ boost::optional<
dcpomatic::
ContentTime> first_video () const {
boost::mutex::scoped_lock lm (_mutex);
return _first_video;
}
void signal_subtitle_stream_changed ();
boost::mutex::scoped_lock lm (_mutex);
return _first_video;
}
void signal_subtitle_stream_changed ();
- boost::optional<std::string> decryption_key () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _decryption_key;
- }
-
- bool encrypted () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _encrypted;
- }
-
private:
private:
- void add_properties (
boost
::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+ void add_properties (
std
::shared_ptr<const Film> film, std::list<UserProperty> &) const;
friend struct ffmpeg_pts_offset_test;
friend struct audio_sampling_rate_test;
friend struct ffmpeg_pts_offset_test;
friend struct audio_sampling_rate_test;
- std::vector<
boost::shared_ptr<FFmpegSubtitleStream>
> _subtitle_streams;
-
boost
::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
- boost::optional<ContentTime> _first_video;
+ std::vector<
std::shared_ptr<FFmpegSubtitleStream>
> _subtitle_streams;
+
std
::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
+ boost::optional<
dcpomatic::
ContentTime> _first_video;
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;
/** Video filters that should be used when generating DCPs */
std::vector<Filter const *> _filters;
@@
-124,8
+116,6
@@
private:
boost::optional<AVColorTransferCharacteristic> _color_trc;
boost::optional<AVColorSpace> _colorspace;
boost::optional<int> _bits_per_pixel;
boost::optional<AVColorTransferCharacteristic> _color_trc;
boost::optional<AVColorSpace> _colorspace;
boost::optional<int> _bits_per_pixel;
- boost::optional<std::string> _decryption_key;
- bool _encrypted;
};
#endif
};
#endif