Fix rebase onto master.

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index a1354e9f87ee91ce8115cc4eb71c901da76d0ec5..d4052defbe1a4787bcf0eeb99e9f6aee2d92c894 100644 (file)
--- 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 8624b7af3db5c022243d9cc76f0756f07e27dfdf..fd0b1c3f7ce544412fe0f712a6a130521987d692 100644 (file)
--- 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 08029068f6cfce3097ed53d73882a219d710191a..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/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)) {