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 581235adca4c9d7ebfe163863c586d5fda06715c..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;
- Time 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
+118,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 ());
@@
-254,12
+259,12
@@
Playlist::best_dcp_frame_rate () const
return best->dcp;
}
return best->dcp;
}
-Time
+
DCP
Time
Playlist::length () const
{
Playlist::length () const
{
-
Time 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;
@@
-279,10
+284,10
@@
Playlist::reconnect ()
}
}
}
}
-Time
+
DCP
Time
Playlist::video_end () const
{
Playlist::video_end () const
{
-
Time 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 ());
@@
-293,7
+298,7
@@
Playlist::video_end () const
}
FrameRateChange
}
FrameRateChange
-Playlist::active_frame_rate_change (Time t, int dcp_video_frame_rate) const
+Playlist::active_frame_rate_change (
DCP
Time t, int dcp_video_frame_rate) const
{
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
{
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
@@
-331,7
+336,7
@@
Playlist::content () const
void
Playlist::repeat (ContentList c, int n)
{
void
Playlist::repeat (ContentList c, int n)
{
- pair<
Time, Time> 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 ());
@@
-339,7
+344,7
@@
Playlist::repeat (ContentList c, int n)
range.second = max (range.second, (*i)->end ());
}
range.second = max (range.second, (*i)->end ());
}
- Time pos = range.second;
+
DCP
Time pos = range.second;
for (int i = 0; i < n; ++i) {
for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
shared_ptr<Content> copy = (*i)->clone ();
for (int i = 0; i < n; ++i) {
for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
shared_ptr<Content> copy = (*i)->clone ();
@@
-372,7
+377,7
@@
Playlist::move_earlier (shared_ptr<Content> c)
return;
}
return;
}
- Time const p = (*previous)->position ();
+
DCP
Time const p = (*previous)->position ();
(*previous)->set_position (p + c->length_after_trim ());
c->set_position (p);
sort (_content.begin(), _content.end(), ContentSorter ());
(*previous)->set_position (p + c->length_after_trim ());
c->set_position (p);
sort (_content.begin(), _content.end(), ContentSorter ());
@@
-399,22
+404,10
@@
Playlist::move_later (shared_ptr<Content> c)
return;
}
return;
}
- Time const p = (*next)->position ();
+
DCP
Time const p = (*next)->position ();
(*next)->set_position (c->position ());
c->set_position (p + c->length_after_trim ());
sort (_content.begin(), _content.end(), ContentSorter ());
Changed ();
}
(*next)->set_position (c->position ());
c->set_position (p + c->length_after_trim ());
sort (_content.begin(), _content.end(), ContentSorter ());
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;
-}