projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix rebase onto master.
[dcpomatic.git]
/
src
/
wx
/
timeline.cc
diff --git
a/src/wx/timeline.cc
b/src/wx/timeline.cc
index 56af6f771b22a08b39e7ae0f072308b3d7158374..8ce811c28c3f668ea913008e16ce4c09fd631a21 100644
(file)
--- a/
src/wx/timeline.cc
+++ b/
src/wx/timeline.cc
@@
-33,6
+33,7
@@
#include "lib/timer.h"
#include "lib/audio_content.h"
#include "lib/subtitle_content.h"
#include "lib/timer.h"
#include "lib/audio_content.h"
#include "lib/subtitle_content.h"
+#include "lib/video_content.h"
#include <wx/graphics.h>
#include <boost/weak_ptr.hpp>
#include <boost/foreach.hpp>
#include <wx/graphics.h>
#include <boost/weak_ptr.hpp>
#include <boost/foreach.hpp>
@@
-149,8
+150,7
@@
Timeline::recreate_views ()
_views.push_back (shared_ptr<TimelineView> (new TimelineVideoContentView (*this, i)));
}
_views.push_back (shared_ptr<TimelineView> (new TimelineVideoContentView (*this, i)));
}
- shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (i);
- if (ac && !ac->audio_mapping().mapped_output_channels().empty ()) {
+ if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) {
_views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
}
_views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
}
@@
-169,7
+169,7
@@
Timeline::film_content_changed (int property, bool frequent)
{
ensure_ui_thread ();
{
ensure_ui_thread ();
- if (property == AudioContentProperty::
AUDIO_
STREAMS) {
+ if (property == AudioContentProperty::STREAMS) {
recreate_views ();
} else if (!frequent) {
setup_pixels_per_second ();
recreate_views ();
} else if (!frequent) {
setup_pixels_per_second ();
@@
-195,8
+195,7
@@
Timeline::assign_tracks ()
if (dynamic_pointer_cast<TimelineVideoContentView> (*i)) {
/* Video on tracks 0 and 1 (left and right eye) */
if (dynamic_pointer_cast<TimelineVideoContentView> (*i)) {
/* Video on tracks 0 and 1 (left and right eye) */
- shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (cv->content ());
- cv->set_track (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT ? 1 : 0);
+ cv->set_track (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT ? 1 : 0);
_tracks = max (_tracks, 2);
continue;
} else if (dynamic_pointer_cast<TimelineSubtitleContentView> (*i)) {
_tracks = max (_tracks, 2);
continue;
} else if (dynamic_pointer_cast<TimelineSubtitleContentView> (*i)) {