diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-25 21:43:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 0a2d40420813403a96352c6dc895d23fcd9994c0 (patch) | |
| tree | 44f707f5bed1b062e45b2d5caf04fcfac7896539 /src | |
| parent | 8008b81c0ccee843263e2a648707b71cc3ae081f (diff) | |
Fix rebase onto master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/audio_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/audio_dialog.h | 2 | ||||
| -rw-r--r-- | src/wx/timeline.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index a1354e9f8..d4052defb 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -175,10 +175,10 @@ AudioDialog::try_to_load_analysis () /* Nothing checked; check mapped ones */ list<int> mapped; - shared_ptr<AudioContent> content = _content.lock (); + shared_ptr<Content> content = _content.lock (); if (content) { - mapped = content->audio_mapping().mapped_output_channels (); + mapped = content->audio->mapping().mapped_output_channels (); } else { mapped = film->mapped_audio_channels (); } diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h index 8624b7af3..fd0b1c3f7 100644 --- a/src/wx/audio_dialog.h +++ b/src/wx/audio_dialog.h @@ -45,7 +45,7 @@ private: boost::shared_ptr<AudioAnalysis> _analysis; boost::weak_ptr<Film> _film; - boost::weak_ptr<AudioContent> _content; + boost::weak_ptr<Content> _content; int _channels; boost::shared_ptr<const Playlist> _playlist; AudioPlot* _plot; diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 08029068f..8ce811c28 100644 --- 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/video_content.h" #include <wx/graphics.h> #include <boost/weak_ptr.hpp> #include <boost/foreach.hpp> @@ -194,8 +195,7 @@ Timeline::assign_tracks () 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)) { |