projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
playlist.cc
diff --git
a/src/lib/playlist.cc
b/src/lib/playlist.cc
index 9fc62f8be6e5345a1bebecca6d3cd9293e6712a2..1e8a3319c54ed0569f0d555902d973eb61155d81 100644
(file)
--- a/
src/lib/playlist.cc
+++ b/
src/lib/playlist.cc
@@
-64,7
+64,7
@@
Playlist::~Playlist ()
void
Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
{
void
Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
{
- if (property == ContentProperty::LENGTH) {
+ if (property == ContentProperty::LENGTH
|| property == VideoContentProperty::VIDEO_FRAME_TYPE
) {
maybe_sequence_video ();
}
maybe_sequence_video ();
}
@@
-81,14
+81,21
@@
Playlist::maybe_sequence_video ()
_sequencing_video = true;
ContentList cl = _content;
_sequencing_video = true;
ContentList cl = _content;
- DCPTime next = 0;
+ DCPTime next_left;
+ DCPTime next_right;
for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
- if (!dynamic_pointer_cast<VideoContent> (*i)) {
+ shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
+ if (!vc) {
continue;
}
continue;
}
- (*i)->set_position (next);
- next = (*i)->end() + 1;
+ if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+ vc->set_position (next_right);
+ next_right = vc->end() + DCPTime::delta ();
+ } else {
+ vc->set_position (next_left);
+ next_left = vc->end() + DCPTime::delta ();
+ }
}
/* This won't change order, so it does not need a sort */
}
/* This won't change order, so it does not need a sort */
@@
-113,11
+120,11
@@
Playlist::video_identifier () const
/** @param node <Playlist> node */
void
/** @param node <Playlist> node */
void
-Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version)
+Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version
, list<string>& notes
)
{
list<cxml::NodePtr> c = node->node_children ("Content");
for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {
{
list<cxml::NodePtr> c = node->node_children ("Content");
for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {
- _content.push_back (content_factory (film, *i, version));
+ _content.push_back (content_factory (film, *i, version
, notes
));
}
sort (_content.begin(), _content.end(), ContentSorter ());
}
sort (_content.begin(), _content.end(), ContentSorter ());
@@
-257,9
+264,9
@@
Playlist::best_dcp_frame_rate () const
DCPTime
Playlist::length () const
{
DCPTime
Playlist::length () const
{
- DCPTime len
= 0
;
+ DCPTime len;
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
- len = max (len, (*i)->end() +
1
);
+ len = max (len, (*i)->end() +
DCPTime::delta ()
);
}
return len;
}
return len;
@@
-282,7
+289,7
@@
Playlist::reconnect ()
DCPTime
Playlist::video_end () const
{
DCPTime
Playlist::video_end () const
{
- DCPTime end
= 0
;
+ DCPTime end;
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
if (dynamic_pointer_cast<const VideoContent> (*i)) {
end = max (end, (*i)->end ());
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
if (dynamic_pointer_cast<const VideoContent> (*i)) {
end = max (end, (*i)->end ());
@@
-331,7
+338,7
@@
Playlist::content () const
void
Playlist::repeat (ContentList c, int n)
{
void
Playlist::repeat (ContentList c, int n)
{
- pair<DCPTime, DCPTime> range (
TIME_MAX, 0
);
+ pair<DCPTime, DCPTime> range (
DCPTime::max (), DCPTime ()
);
for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
range.first = min (range.first, (*i)->position ());
range.second = max (range.second, (*i)->position ());
for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
range.first = min (range.first, (*i)->position ());
range.second = max (range.second, (*i)->position ());
@@
-406,15
+413,3
@@
Playlist::move_later (shared_ptr<Content> c)
Changed ();
}
Changed ();
}
-
-bool
-Playlist::content_paths_valid () const
-{
- for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
- if (!(*i)->path_valid ()) {
- return false;
- }
- }
-
- return true;
-}