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
/
timeline.cc
diff --git
a/src/wx/timeline.cc
b/src/wx/timeline.cc
index e96b474cf55dd7413283f53303e126fc715ba0a8..f7a31117bd9ecfe21cee2d32d1ea7c7f39efbaec 100644
(file)
--- a/
src/wx/timeline.cc
+++ b/
src/wx/timeline.cc
@@
-25,7
+25,7
@@
#include "timeline_labels_view.h"
#include "timeline_video_content_view.h"
#include "timeline_audio_content_view.h"
#include "timeline_labels_view.h"
#include "timeline_video_content_view.h"
#include "timeline_audio_content_view.h"
-#include "timeline_
subtitle
_content_view.h"
+#include "timeline_
text
_content_view.h"
#include "timeline_atmos_content_view.h"
#include "content_panel.h"
#include "wx_util.h"
#include "timeline_atmos_content_view.h"
#include "content_panel.h"
#include "wx_util.h"
@@
-34,7
+34,7
@@
#include "lib/image_content.h"
#include "lib/timer.h"
#include "lib/audio_content.h"
#include "lib/image_content.h"
#include "lib/timer.h"
#include "lib/audio_content.h"
-#include "lib/
subtitle
_content.h"
+#include "lib/
caption
_content.h"
#include "lib/video_content.h"
#include "lib/atmos_mxf_content.h"
#include <wx/graphics.h>
#include "lib/video_content.h"
#include "lib/atmos_mxf_content.h"
#include <wx/graphics.h>
@@
-228,8
+228,8
@@
Timeline::recreate_views ()
_views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
}
_views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
}
-
if (i->subtitle
) {
- _views.push_back (shared_ptr<TimelineView> (new Timeline
SubtitleContentView (*this, i
)));
+
BOOST_FOREACH (shared_ptr<CaptionContent> j, i->caption
) {
+ _views.push_back (shared_ptr<TimelineView> (new Timeline
TextContentView (*this, i, j
)));
}
if (dynamic_pointer_cast<AtmosMXFContent> (i)) {
}
if (dynamic_pointer_cast<AtmosMXFContent> (i)) {
@@
-334,9
+334,9
@@
Timeline::assign_tracks ()
/* Tracks are:
Video (mono or left-eye)
Video (right-eye)
/* Tracks are:
Video (mono or left-eye)
Video (right-eye)
-
Subtitle
1
-
Subtitle
2
-
Subtitle
N
+
Caption
1
+
Caption
2
+
Caption
N
Atmos
Audio 1
Audio 2
Atmos
Audio 1
Audio 2
@@
-373,9
+373,9
@@
Timeline::assign_tracks ()
_tracks = max (_tracks, 1);
_tracks = max (_tracks, 1);
- /*
Subtitle
*/
+ /*
Captions
*/
- int const
subtitle_tracks = place<TimelineSubtitle
ContentView> (_views, _tracks);
+ int const
caption_tracks = place<TimelineText
ContentView> (_views, _tracks);
/* Atmos */
/* Atmos */
@@
-405,7
+405,7
@@
Timeline::assign_tracks ()
_labels_view->set_3d (have_3d);
_labels_view->set_audio_tracks (audio_tracks);
_labels_view->set_3d (have_3d);
_labels_view->set_audio_tracks (audio_tracks);
- _labels_view->set_
subtitle_tracks (subtitle
_tracks);
+ _labels_view->set_
caption_tracks (caption
_tracks);
_labels_view->set_atmos (have_atmos);
_time_axis_view->set_y (tracks());
_labels_view->set_atmos (have_atmos);
_time_axis_view->set_y (tracks());