projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let's not accept EAGAIN until we're sure it's possible.
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index 1281897e011a6e8199347967fcee46ed6adf0763..52e8c04e6984f26d389d74ec61189fa80f749a69 100644
(file)
--- a/
src/lib/decoder.cc
+++ b/
src/lib/decoder.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-21,29
+21,40
@@
#include "decoder.h"
#include "video_decoder.h"
#include "audio_decoder.h"
#include "decoder.h"
#include "video_decoder.h"
#include "audio_decoder.h"
-#include "
subtitle
_decoder.h"
+#include "
text
_decoder.h"
#include <boost/optional.hpp>
#include <iostream>
using std::cout;
using boost::optional;
#include <boost/optional.hpp>
#include <iostream>
using std::cout;
using boost::optional;
+using boost::shared_ptr;
+using boost::weak_ptr;
+
+Decoder::Decoder (weak_ptr<const Film> film)
+ : _film (film)
+{
+
+}
/** @return Earliest time of content that the next pass() will emit */
ContentTime
Decoder::position () const
{
optional<ContentTime> pos;
/** @return Earliest time of content that the next pass() will emit */
ContentTime
Decoder::position () const
{
optional<ContentTime> pos;
+ shared_ptr<const Film> f = film();
- if (video &&
(!pos || video->position(
) < *pos)) {
- pos = video->position();
+ if (video &&
!video->ignore() && (!pos || video->position(f
) < *pos)) {
+ pos = video->position(
f
);
}
}
- if (audio &&
(!pos || audio->position(
) < *pos)) {
- pos = audio->position();
+ if (audio &&
!audio->ignore() && (!pos || audio->position(f
) < *pos)) {
+ pos = audio->position(
f
);
}
}
- if (subtitle && (!pos || subtitle->position() < *pos)) {
- pos = subtitle->position();
+ BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+ if (!i->ignore() && (!pos || i->position(f) < *pos)) {
+ pos = i->position(f);
+ }
}
return pos.get_value_or(ContentTime());
}
return pos.get_value_or(ContentTime());
@@
-52,10
+63,31
@@
Decoder::position () const
void
Decoder::seek (ContentTime, bool)
{
void
Decoder::seek (ContentTime, bool)
{
+ if (video) {
+ video->seek ();
+ }
if (audio) {
audio->seek ();
}
if (audio) {
audio->seek ();
}
- if (subtitle) {
- subtitle->seek ();
+ BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+ i->seek ();
+ }
+}
+
+shared_ptr<TextDecoder>
+Decoder::only_text () const
+{
+ DCPOMATIC_ASSERT (text.size() < 2);
+ if (text.empty ()) {
+ return shared_ptr<TextDecoder> ();
}
}
+ return text.front ();
+}
+
+shared_ptr<const Film>
+Decoder::film () const
+{
+ shared_ptr<const Film> f = _film.lock ();
+ DCPOMATIC_ASSERT (f);
+ return f;
}
}