#include "video_content.h"
#include "ffmpeg_decoder.h"
#include "ffmpeg_content.h"
-#include "still_image_decoder.h"
-#include "still_image_content.h"
+#include "image_decoder.h"
#include "content_factory.h"
#include "job.h"
#include "config.h"
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 ();
}
void
Playlist::maybe_sequence_video ()
{
- boost::mutex::scoped_lock lm (_mutex);
-
if (!_sequence_video || _sequencing_video) {
return;
}
_sequencing_video = true;
ContentList cl = _content;
- sort (cl.begin(), cl.end(), ContentSorter ());
- Time last = 0;
- for (ContentList::iterator i = cl.begin(); i != cl.end(); ++i) {
- if (!dynamic_pointer_cast<VideoContent> (*i)) {
+ Time next_left = 0;
+ Time next_right = 0;
+ for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
+ shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
+ if (!vc) {
continue;
}
-
- (*i)->set_position (last);
- last = (*i)->end ();
+
+ if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+ vc->set_position (next_right);
+ next_right = vc->end() + 1;
+ } else {
+ vc->set_position (next_left);
+ next_left = vc->end() + 1;
+ }
}
+
+ /* This won't change order, so it does not need a sort */
_sequencing_video = false;
}
string
Playlist::video_identifier () const
{
- boost::mutex::scoped_lock lm (_mutex);
-
string t;
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
/** @param node <Playlist> node */
void
-Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node)
+Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version, list<string>& notes)
{
- boost::mutex::scoped_lock lm (_mutex);
-
- list<shared_ptr<cxml::Node> > c = node->node_children ("Content");
- for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
- _content.push_back (content_factory (film, *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, notes));
}
+ sort (_content.begin(), _content.end(), ContentSorter ());
+
reconnect ();
}
void
Playlist::as_xml (xmlpp::Node* node)
{
- boost::mutex::scoped_lock lm (_mutex);
-
for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
(*i)->as_xml (node->add_child ("Content"));
}
void
Playlist::add (shared_ptr<Content> c)
{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _content.push_back (c);
- reconnect ();
- }
-
+ _content.push_back (c);
+ sort (_content.begin(), _content.end(), ContentSorter ());
+ reconnect ();
Changed ();
}
void
Playlist::remove (shared_ptr<Content> c)
{
- bool changed = false;
-
- {
- boost::mutex::scoped_lock lm (_mutex);
- ContentList::iterator i = _content.begin ();
- while (i != _content.end() && *i != c) {
- ++i;
- }
-
- if (i != _content.end ()) {
- _content.erase (i);
- reconnect ();
- changed = true;
- }
+ ContentList::iterator i = _content.begin ();
+ while (i != _content.end() && *i != c) {
+ ++i;
}
-
- if (changed) {
+
+ if (i != _content.end ()) {
+ _content.erase (i);
Changed ();
}
+
+ /* This won't change order, so it does not need a sort */
}
void
Playlist::remove (ContentList c)
{
- bool changed = false;
-
- {
- boost::mutex::scoped_lock lm (_mutex);
- for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- ContentList::iterator j = _content.begin ();
- while (j != _content.end() && *j != *i) {
- ++j;
- }
-
- if (j != _content.end ()) {
- _content.erase (j);
- changed = true;
- }
+ for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+ ContentList::iterator j = _content.begin ();
+ while (j != _content.end() && *j != *i) {
+ ++j;
}
-
- if (changed) {
- reconnect ();
+
+ if (j != _content.end ()) {
+ _content.erase (j);
}
}
- if (changed) {
- Changed ();
- }
+ /* This won't change order, so it does not need a sort */
+
+ Changed ();
}
bool
Playlist::has_subtitles () const
{
- boost::mutex::scoped_lock lm (_mutex);
-
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()) {
int
Playlist::best_dcp_frame_rate () const
{
- boost::mutex::scoped_lock lm (_mutex);
-
list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
/* Work out what rates we could manage, including those achieved by using skip / repeat. */
Time
Playlist::length () const
{
- boost::mutex::scoped_lock lm (_mutex);
-
Time len = 0;
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
- len = max (len, (*i)->end ());
+ len = max (len, (*i)->end() + 1);
}
return len;
}
-/* Caller must hold a lock on _mutex */
void
Playlist::reconnect ()
{
Time
Playlist::video_end () const
{
- boost::mutex::scoped_lock lm (_mutex);
-
Time end = 0;
for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
if (dynamic_pointer_cast<const VideoContent> (*i)) {
void
Playlist::set_sequence_video (bool s)
{
- boost::mutex::scoped_lock lm (_mutex);
_sequence_video = s;
}
ContentList
Playlist::content () const
{
- boost::mutex::scoped_lock lm (_mutex);
return _content;
}
void
Playlist::repeat (ContentList c, int n)
{
- {
- boost::mutex::scoped_lock lm (_mutex);
- pair<Time, Time> range (TIME_MAX, 0);
+ pair<Time, Time> range (TIME_MAX, 0);
+ for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+ range.first = min (range.first, (*i)->position ());
+ range.second = max (range.second, (*i)->position ());
+ range.first = min (range.first, (*i)->end ());
+ range.second = max (range.second, (*i)->end ());
+ }
+
+ Time pos = range.second;
+ for (int i = 0; i < n; ++i) {
for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
- range.first = min (range.first, (*i)->position ());
- range.second = max (range.second, (*i)->position ());
- range.first = min (range.first, (*i)->end ());
- range.second = max (range.second, (*i)->end ());
+ shared_ptr<Content> copy = (*i)->clone ();
+ copy->set_position (pos + copy->position() - range.first);
+ _content.push_back (copy);
}
-
- 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 ();
- copy->set_position (pos + copy->position() - range.first);
- _content.push_back (copy);
- }
- pos += range.second - range.first;
- }
-
- reconnect ();
+ pos += range.second - range.first;
+ }
+
+ sort (_content.begin(), _content.end(), ContentSorter ());
+
+ reconnect ();
+ Changed ();
+}
+
+void
+Playlist::move_earlier (shared_ptr<Content> c)
+{
+ sort (_content.begin(), _content.end(), ContentSorter ());
+
+ ContentList::iterator previous = _content.end ();
+ ContentList::iterator i = _content.begin();
+ while (i != _content.end() && *i != c) {
+ previous = i;
+ ++i;
}
+
+ assert (i != _content.end ());
+ if (previous == _content.end ()) {
+ return;
+ }
+
+ Time const p = (*previous)->position ();
+ (*previous)->set_position (p + c->length_after_trim ());
+ c->set_position (p);
+ sort (_content.begin(), _content.end(), ContentSorter ());
+
+ Changed ();
+}
+
+void
+Playlist::move_later (shared_ptr<Content> c)
+{
+ sort (_content.begin(), _content.end(), ContentSorter ());
+
+ ContentList::iterator i = _content.begin();
+ while (i != _content.end() && *i != c) {
+ ++i;
+ }
+
+ assert (i != _content.end ());
+
+ ContentList::iterator next = i;
+ ++next;
+
+ if (next == _content.end ()) {
+ return;
+ }
+
+ 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 ();
}
projects / dcpomatic.git / blobdiff