projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.h
diff --git
a/src/lib/dcp_decoder.h
b/src/lib/dcp_decoder.h
index 89931aa38361695ccc1e7750b3d5956761dde341..61fd91abaf6cb605eee10807be444f2e720649bc 100644
(file)
--- a/
src/lib/dcp_decoder.h
+++ b/
src/lib/dcp_decoder.h
@@
-1,25
+1,28
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-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/>.
*/
*/
-#include "video_decoder.h"
-#include "audio_decoder.h"
-#include "subtitle_decoder.h"
+/** @file src/dcp_decoder.h
+ * @brief A decoder of existing DCPs.
+ */
+
+#include "decoder.h"
namespace dcp {
class Reel;
namespace dcp {
class Reel;
@@
-27,17
+30,27
@@
namespace dcp {
class DCPContent;
class Log;
class DCPContent;
class Log;
+struct dcp_subtitle_within_dcp_test;
-class DCPDecoder : public
VideoDecoder, public AudioDecoder, public Subtitle
Decoder
+class DCPDecoder : public Decoder
{
public:
{
public:
- DCPDecoder (boost::shared_ptr<const DCPContent>);
+ DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log, bool fast);
+
+ std::list<boost::shared_ptr<dcp::Reel> > reels () const {
+ return _reels;
+ }
private:
private:
+ friend struct dcp_subtitle_within_dcp_test;
+
+ bool pass (PassReason, bool accurate);
void seek (ContentTime t, bool accurate);
void seek (ContentTime t, bool accurate);
- bool pass ();
- std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+ std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+ std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+
+ /** Time of next thing to return from pass relative to the start of _reel */
ContentTime _next;
std::list<boost::shared_ptr<dcp::Reel> > _reels;
std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
ContentTime _next;
std::list<boost::shared_ptr<dcp::Reel> > _reels;
std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;