projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basics of multiple captions per content so that DCPContent can
[dcpomatic.git]
/
src
/
wx
/
timing_panel.cc
diff --git
a/src/wx/timing_panel.cc
b/src/wx/timing_panel.cc
index 315ead52430eb641339f964a8e2385fb01f6ae81..9bb608cb2637b8f66b5e3b5fcca327267247f49d 100644
(file)
--- a/
src/wx/timing_panel.cc
+++ b/
src/wx/timing_panel.cc
@@
-26,10
+26,10
@@
#include "move_to_dialog.h"
#include "lib/content.h"
#include "lib/image_content.h"
#include "move_to_dialog.h"
#include "lib/content.h"
#include "lib/image_content.h"
-#include "lib/
text
_content.h"
-#include "lib/dcp_
text
_content.h"
+#include "lib/
caption
_content.h"
+#include "lib/dcp_
subtitle
_content.h"
#include "lib/audio_content.h"
#include "lib/audio_content.h"
-#include "lib/text_
text
_content.h"
+#include "lib/text_
caption_file
_content.h"
#include "lib/video_content.h"
#include <dcp/locale_convert.h>
#include <boost/foreach.hpp>
#include "lib/video_content.h"
#include <dcp/locale_convert.h>
#include <boost/foreach.hpp>
@@
-282,7
+282,7
@@
TimingPanel::film_content_changed (int property)
++count_ac;
content = i;
}
++count_ac;
content = i;
}
- if (
i->subtitle
&& i->video_frame_rate()) {
+ if (
!i->caption.empty()
&& i->video_frame_rate()) {
++count_sc;
content = i;
}
++count_sc;
content = i;
}