projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b0a9bc8
)
Remove debugging code.
author
Carl Hetherington
<cth@carlh.net>
Wed, 14 Jan 2015 09:22:14 +0000
(09:22 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 14 Jan 2015 09:22:14 +0000
(09:22 +0000)
src/subtitle_asset.cc
patch
|
blob
|
history
diff --git
a/src/subtitle_asset.cc
b/src/subtitle_asset.cc
index e5ef9cd22caf2057412ed7b62417b87a1147a128..100f6a4e3aacd261a03d603d0342cb4949ce2fc5 100644
(file)
--- a/
src/subtitle_asset.cc
+++ b/
src/subtitle_asset.cc
@@
-187,8
+187,6
@@
SubtitleAsset::maybe_add_subtitle (string text, ParseState& parse_state)
libdcp::parse::Text effective_text (*parse_state.text_nodes.back ());
libdcp::parse::Subtitle effective_subtitle (*parse_state.subtitle_nodes.back ());
libdcp::parse::Text effective_text (*parse_state.text_nodes.back ());
libdcp::parse::Subtitle effective_subtitle (*parse_state.subtitle_nodes.back ());
- cout << "Maybe add " << text << "\n";
-
shared_ptr<Subtitle> c = parse_state.current;
if (!c ||
effective_subtitle.in != c->in() ||
shared_ptr<Subtitle> c = parse_state.current;
if (!c ||
effective_subtitle.in != c->in() ||
@@
-196,8
+194,6
@@
SubtitleAsset::maybe_add_subtitle (string text, ParseState& parse_state)
effective_text.v_position != c->v_position() ||
effective_text.v_align != c->v_align()) {
effective_text.v_position != c->v_position() ||
effective_text.v_align != c->v_align()) {
- cout << "(reset)\n";
-
parse_state.current.reset (
new Subtitle (
font_id_to_name (effective_font.id),
parse_state.current.reset (
new Subtitle (
font_id_to_name (effective_font.id),