projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up after previous commit.
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index e7e6b8620e9332e0dc51f79f8c5d4e743f884758..70eb5b61a3f34b4fad30cc22f82683f448789751 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,7
+21,7
@@
#include "decoder.h"
#include "video_decoder.h"
#include "audio_decoder.h"
#include "decoder.h"
#include "video_decoder.h"
#include "audio_decoder.h"
-#include "
text
_decoder.h"
+#include "
caption
_decoder.h"
#include <boost/optional.hpp>
#include <iostream>
#include <boost/optional.hpp>
#include <iostream>
@@
-42,8
+42,8
@@
Decoder::position () const
pos = audio->position();
}
pos = audio->position();
}
- if (
subtitle && !subtitle->ignore() && (!pos || subtitle
->position() < *pos)) {
- pos =
subtitle
->position();
+ if (
caption && !caption->ignore() && (!pos || caption
->position() < *pos)) {
+ pos =
caption
->position();
}
return pos.get_value_or(ContentTime());
}
return pos.get_value_or(ContentTime());
@@
-58,7
+58,7
@@
Decoder::seek (ContentTime, bool)
if (audio) {
audio->seek ();
}
if (audio) {
audio->seek ();
}
- if (
subtitle
) {
-
subtitle
->seek ();
+ if (
caption
) {
+
caption
->seek ();
}
}
}
}