Rename Subtitle -> Text

[dcpomatic.git] / src / wx / timeline.cc

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 017d27dfb4812fc1c6bb7c582e714bbe8daf8d01..d0a898b18f645d3d469c997b039f88ed138f78ed 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_subtitle_content_view.h"
+#include "timeline_text_content_view.h"
 #include "timeline_atmos_content_view.h"
 #include "content_panel.h"
 #include "wx_util.h"
@@ -34,13 +34,14 @@
 #include "lib/image_content.h"
 #include "lib/timer.h"
 #include "lib/audio_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/video_content.h"
 #include "lib/atmos_mxf_content.h"
 #include <wx/graphics.h>
 #include <boost/weak_ptr.hpp>
 #include <boost/foreach.hpp>
 #include <list>
+#include <iterator>
 #include <iostream>
 
 using std::list;
@@ -228,7 +229,7 @@ Timeline::recreate_views ()
                }
 
                if (i->subtitle) {
-                       _views.push_back (shared_ptr<TimelineView> (new TimelineSubtitleContentView (*this, i)));
+                       _views.push_back (shared_ptr<TimelineView> (new TimelineTextContentView (*this, i)));
                }
 
                if (dynamic_pointer_cast<AtmosMXFContent> (i)) {
@@ -306,6 +307,27 @@ place (TimelineViewList& views, int& tracks)
        return tracks - base;
 }
 
+/** Compare the mapped output channels of two TimelineViews, so we can into
+ *  order of first mapped DCP channel.
+ */
+struct AudioMappingComparator {
+       bool operator()(shared_ptr<TimelineView> a, shared_ptr<TimelineView> b) {
+               int la = -1;
+               shared_ptr<TimelineAudioContentView> cva = dynamic_pointer_cast<TimelineAudioContentView>(a);
+               if (cva) {
+                       list<int> oc = cva->content()->audio->mapping().mapped_output_channels();
+                       la = *min_element(boost::begin(oc), boost::end(oc));
+               }
+               int lb = -1;
+               shared_ptr<TimelineAudioContentView> cvb = dynamic_pointer_cast<TimelineAudioContentView>(b);
+               if (cvb) {
+                       list<int> oc = cvb->content()->audio->mapping().mapped_output_channels();
+                       lb = *min_element(boost::begin(oc), boost::end(oc));
+               }
+               return la < lb;
+       }
+};
+
 void
 Timeline::assign_tracks ()
 {
@@ -353,7 +375,7 @@ Timeline::assign_tracks ()
 
        /* Subtitle */
 
-       int const subtitle_tracks = place<TimelineSubtitleContentView> (_views, _tracks);
+       int const subtitle_tracks = place<TimelineTextContentView> (_views, _tracks);
 
        /* Atmos */
 
@@ -373,11 +395,16 @@ Timeline::assign_tracks ()
                ++_tracks;
        }
 
-       /* Audio */
+       /* Audio.  We're sorting the views so that we get the audio views in order of increasing
+          DCP channel index.
+       */
 
-       place<TimelineAudioContentView> (_views, _tracks);
+       TimelineViewList views = _views;
+       sort(views.begin(), views.end(), AudioMappingComparator());
+       int const audio_tracks = place<TimelineAudioContentView> (views, _tracks);
 
        _labels_view->set_3d (have_3d);
+       _labels_view->set_audio_tracks (audio_tracks);
        _labels_view->set_subtitle_tracks (subtitle_tracks);
        _labels_view->set_atmos (have_atmos);
 
@@ -398,9 +425,12 @@ Timeline::setup_scrollbars ()
        if (!film || !_pixels_per_second) {
                return;
        }
-       _labels_canvas->SetVirtualSize (_labels_view->bbox().width, tracks() * pixels_per_track() + 96);
+
+       int const h = tracks() * pixels_per_track() + tracks_y_offset() + _time_axis_view->bbox().height;
+
+       _labels_canvas->SetVirtualSize (_labels_view->bbox().width, h);
        _labels_canvas->SetScrollRate (_x_scroll_rate, _y_scroll_rate);
-       _main_canvas->SetVirtualSize (*_pixels_per_second * film->length().seconds(), tracks() * pixels_per_track() + tracks_y_offset() + _time_axis_view->bbox().height);
+       _main_canvas->SetVirtualSize (*_pixels_per_second * film->length().seconds(), h);
        _main_canvas->SetScrollRate (_x_scroll_rate, _y_scroll_rate);
 }
 
@@ -552,13 +582,14 @@ Timeline::left_up_zoom (wxMouseEvent& ev)
        DCPTime const time_right = DCPTime::from_seconds((bottom_right.x + vsx) / *_pixels_per_second);
        set_pixels_per_second (double(GetSize().GetWidth()) / (time_right.seconds() - time_left.seconds()));
 
-       double const tracks_top = double(top_left.y) / _pixels_per_track;
-       double const tracks_bottom = double(bottom_right.y) / _pixels_per_track;
+       double const tracks_top = double(top_left.y - tracks_y_offset()) / _pixels_per_track;
+       double const tracks_bottom = double(bottom_right.y - tracks_y_offset()) / _pixels_per_track;
        set_pixels_per_track (lrint(GetSize().GetHeight() / (tracks_bottom - tracks_top)));
 
        setup_scrollbars ();
-       _main_canvas->Scroll (time_left.seconds() * *_pixels_per_second / _x_scroll_rate, tracks_top * _pixels_per_track / _y_scroll_rate);
-       _labels_canvas->Scroll (0, tracks_top * _pixels_per_track / _y_scroll_rate);
+       int const y = (tracks_top * _pixels_per_track + tracks_y_offset()) / _y_scroll_rate;
+       _main_canvas->Scroll (time_left.seconds() * *_pixels_per_second / _x_scroll_rate, y);
+       _labels_canvas->Scroll (0, y);
 
        _zoom_point = optional<wxPoint> ();
        Refresh ();
@@ -808,7 +839,9 @@ void
 Timeline::scrolled (wxScrollWinEvent& ev)
 {
        if (ev.GetOrientation() == wxVERTICAL) {
-               _labels_canvas->Scroll (0, ev.GetPosition ());
+               int x, y;
+               _main_canvas->GetViewStart (&x, &y);
+               _labels_canvas->Scroll (0, y);
        }
        ev.Skip ();
 }