projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add AudioMapping::take_from().
[dcpomatic.git]
/
src
/
lib
/
content.h
diff --git
a/src/lib/content.h
b/src/lib/content.h
index ba4c23ddf8cbb155f745b0ff33914fd747952866..0ce87ed9be0a192ec6923036f724b9d33abe7cd0 100644
(file)
--- a/
src/lib/content.h
+++ b/
src/lib/content.h
@@
-31,8
+31,8
@@
#include "change_signaller.h"
#include "dcpomatic_time.h"
#include "signaller.h"
#include "change_signaller.h"
#include "dcpomatic_time.h"
#include "signaller.h"
-#include "types.h"
#include "user_property.h"
#include "user_property.h"
+#include "text_type.h"
#include <libcxml/cxml.h>
#include <boost/filesystem.hpp>
#include <boost/signals2.hpp>
#include <libcxml/cxml.h>
#include <boost/filesystem.hpp>
#include <boost/signals2.hpp>
@@
-50,6
+50,9
@@
namespace cxml {
class Job;
class Film;
class AtmosContent;
class Job;
class Film;
class AtmosContent;
+class AudioContent;
+class TextContent;
+class VideoContent;
class ContentProperty
{
class ContentProperty
{
@@
-153,7
+156,7
@@
public:
return _position;
}
return _position;
}
- void set_trim_start
(
dcpomatic::ContentTime);
+ void set_trim_start
(std::shared_ptr<const Film> film,
dcpomatic::ContentTime);
dcpomatic::ContentTime trim_start () const {
boost::mutex::scoped_lock lm (_mutex);
dcpomatic::ContentTime trim_start () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-172,6
+175,10
@@
public:
return position() + length_after_trim(film);
}
return position() + length_after_trim(film);
}
+ dcpomatic::DCPTimePeriod period(std::shared_ptr<const Film> film) const {
+ return { position(), end(film) };
+ }
+
dcpomatic::DCPTime length_after_trim (std::shared_ptr<const Film> film) const;
boost::optional<double> video_frame_rate () const {
dcpomatic::DCPTime length_after_trim (std::shared_ptr<const Film> film) const;
boost::optional<double> video_frame_rate () const {
@@
-179,7
+186,7
@@
public:
return _video_frame_rate;
}
return _video_frame_rate;
}
- void set_video_frame_rate
(
double r);
+ void set_video_frame_rate
(std::shared_ptr<const Film> film,
double r);
void unset_video_frame_rate ();
double active_video_frame_rate (std::shared_ptr<const Film> film) const;
void unset_video_frame_rate ();
double active_video_frame_rate (std::shared_ptr<const Film> film) const;
@@
-201,7
+208,7
@@
public:
std::shared_ptr<VideoContent> video;
std::shared_ptr<AudioContent> audio;
std::shared_ptr<VideoContent> video;
std::shared_ptr<AudioContent> audio;
- std::
list
<std::shared_ptr<TextContent>> text;
+ std::
vector
<std::shared_ptr<TextContent>> text;
std::shared_ptr<AtmosContent> atmos;
std::shared_ptr<TextContent> only_text () const;
std::shared_ptr<AtmosContent> atmos;
std::shared_ptr<TextContent> only_text () const;