projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More renaming.
[dcpomatic.git]
/
src
/
wx
/
content_panel.cc
diff --git
a/src/wx/content_panel.cc
b/src/wx/content_panel.cc
index 1680e5926b2a8d36e223401391199e43eee2c93b..8a24b21702639675e935b1044ada4fa65cd640bf 100644
(file)
--- a/
src/wx/content_panel.cc
+++ b/
src/wx/content_panel.cc
@@
-28,7
+28,7
@@
#include "image_sequence_dialog.h"
#include "film_viewer.h"
#include "lib/audio_content.h"
#include "image_sequence_dialog.h"
#include "film_viewer.h"
#include "lib/audio_content.h"
-#include "lib/
subtitle
_content.h"
+#include "lib/
text
_content.h"
#include "lib/video_content.h"
#include "lib/ffmpeg_content.h"
#include "lib/content_factory.h"
#include "lib/video_content.h"
#include "lib/ffmpeg_content.h"
#include "lib/content_factory.h"
@@
-39,8
+39,8
@@
#include "lib/config.h"
#include "lib/log.h"
#include "lib/compose.hpp"
#include "lib/config.h"
#include "lib/log.h"
#include "lib/compose.hpp"
-#include "lib/
text_subtitle
_content.h"
-#include "lib/
text_subtitle
.h"
+#include "lib/
plain_text
_content.h"
+#include "lib/
plain_text
.h"
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/listctrl.h>
@@
-258,11
+258,11
@@
ContentPanel::selection_changed ()
BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
DCPTime p;
p = i->position();
BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
DCPTime p;
p = i->position();
- if (dynamic_pointer_cast<
TextSubtitleContent>(i
)) {
+ if (dynamic_pointer_cast<
PlainTextContent>(i) && i->paths_valid(
)) {
/* Rather special case; if we select a text subtitle file jump to its
first subtitle.
*/
/* Rather special case; if we select a text subtitle file jump to its
first subtitle.
*/
-
TextSubtitle ts (dynamic_pointer_cast<TextSubtitle
Content>(i));
+
PlainText ts (dynamic_pointer_cast<PlainText
Content>(i));
if (ts.first()) {
p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position()));
}
if (ts.first()) {
p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position()));
}