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 b7b4c20f7fc56b6dc232be8a773360bab0bcee83..16c740943ca89f382f27082ba70a935d987c484b 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"
@@
-31,6
+30,7
@@
#include "job.h"
#include "config.h"
#include "util.h"
#include "job.h"
#include "config.h"
#include "util.h"
+#include "md5_digester.h"
#include "i18n.h"
#include "i18n.h"
@@
-46,7
+46,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
+63,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
+80,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 */
@@
-108,16
+114,18
@@
Playlist::video_identifier () const
}
}
}
}
- return md5_digest (t.c_str(), t.length());
+ MD5Digester digester;
+ digester.add (t.c_str(), t.length());
+ return digester.get ();
}
/** @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,
cxml::ConstNodePtr 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 ());
@@
-178,19
+186,6
@@
Playlist::remove (ContentList c)
Changed ();
}
Changed ();
}
-bool
-Playlist::has_subtitles () const
-{
- for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
- shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
- if (fc && !fc->subtitle_streams().empty()) {
- return true;
- }
- }
-
- return false;
-}
-
class FrameRateCandidate
{
public:
class FrameRateCandidate
{
public:
@@
-298,7
+293,7
@@
Playlist::active_frame_rate_change (DCPTime 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);
if (!vc) {
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
if (!vc) {
-
break
;
+
continue
;
}
if (vc->position() >= t && t < vc->end()) {
}
if (vc->position() >= t && t < vc->end()) {
@@
-371,13
+366,12
@@
Playlist::move_earlier (shared_ptr<Content> c)
if (previous == _content.end ()) {
return;
}
if (previous == _content.end ()) {
return;
}
+
DCPTime const p = (*previous)->position ();
(*previous)->set_position (p + c->length_after_trim ());
c->set_position (p);
sort (_content.begin(), _content.end(), ContentSorter ());
DCPTime const p = (*previous)->position ();
(*previous)->set_position (p + c->length_after_trim ());
c->set_position (p);
sort (_content.begin(), _content.end(), ContentSorter ());
-
- Changed ();
}
void
}
void
@@
-399,10
+393,7
@@
Playlist::move_later (shared_ptr<Content> c)
return;
}
return;
}
- DCPTime const p = (*next)->position ();
(*next)->set_position (c->position ());
(*next)->set_position (c->position ());
- c->set_position (
p
+ c->length_after_trim ());
+ c->set_position (
c->position()
+ c->length_after_trim ());
sort (_content.begin(), _content.end(), ContentSorter ());
sort (_content.begin(), _content.end(), ContentSorter ());
-
- Changed ();
}
}