projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic grunt-work, untested and unfinished, but it compiles.
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index 7f4973737faff0146f971f91c846cc4c8a5dabef..785fb96f0c2ed4b0b7637abba296bcbb61ca40b1 100644
(file)
--- a/
src/lib/decoder.cc
+++ b/
src/lib/decoder.cc
@@
-1,74
+1,44
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2016
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-/** @file src/decoder.cc
- * @brief Parent class for decoders of content.
- */
-
-#include "film.h"
#include "decoder.h"
#include "decoder.h"
-#include "decoded.h"
-
-#include "i18n.h"
-
-using boost::shared_ptr;
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "subtitle_decoder.h"
-/** @param f Film.
- * @param o Decode options.
- */
-Decoder::Decoder (shared_ptr<const Film> f)
- : _film (f)
+ContentTime
+Decoder::position () const
{
{
+ ContentTime pos;
-}
-
-class DecodedSorter
-{
-public:
- bool operator() (shared_ptr<Decoded> a, shared_ptr<Decoded> b)
- {
- return a->dcp_time < b->dcp_time;
+ if (video && video->position()) {
+ pos = min (pos, video->position().get());
}
}
-};
-shared_ptr<Decoded>
-Decoder::peek ()
-{
- while (_pending.empty() && !pass ()) {}
-
- if (_pending.empty ()) {
- return shared_ptr<Decoded> ();
+ if (audio && audio->position()) {
+ pos = min (pos, audio->position().get());
}
}
- return _pending.front ();
-}
-
-void
-Decoder::consume ()
-{
- if (!_pending.empty ()) {
- _pending.pop_front ();
+ if (subtitle && subtitle->position()) {
+ pos = min (pos, subtitle->position().get());
}
}
-}
-void
-Decoder::seek (ContentTime, bool)
-{
- _pending.clear ();
+ return pos;
}
}