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 c46e65d8bfface99d07ef8d5dc00e2475c374f31..9a048980c0b02aebadd481db236149df8544de8e 100644
(file)
--- a/
src/lib/playlist.cc
+++ b/
src/lib/playlist.cc
@@
-19,7
+19,6
@@
#include <libcxml/cxml.h>
#include <boost/shared_ptr.hpp>
#include <libcxml/cxml.h>
#include <boost/shared_ptr.hpp>
-#include <boost/lexical_cast.hpp>
#include "playlist.h"
#include "sndfile_content.h"
#include "sndfile_decoder.h"
#include "playlist.h"
#include "sndfile_content.h"
#include "sndfile_decoder.h"
@@
-46,7
+45,6
@@
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
-using boost::lexical_cast;
Playlist::Playlist ()
: _sequence_video (true)
Playlist::Playlist ()
: _sequence_video (true)
@@
-64,7
+62,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
+79,21
@@
Playlist::maybe_sequence_video ()
_sequencing_video = true;
ContentList cl = _content;
_sequencing_video = true;
ContentList cl = _content;
- DCPTime next;
+ 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() + DCPTime::delta ();
+ 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 */