X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=f93953737781b953751979f9c69177daf4c63158;hb=492bc5579d950e08847750ee1fba1187ba00d3c3;hp=08029068f6cfce3097ed53d73882a219d710191a;hpb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d;p=dcpomatic.git

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 08029068f..f93953737 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,6 +26,7 @@
 #include "timeline_video_content_view.h"
 #include "timeline_audio_content_view.h"
 #include "timeline_subtitle_content_view.h"
+#include "timeline_atmos_content_view.h"
 #include "content_panel.h"
 #include "wx_util.h"
 #include "lib/film.h"
@@ -33,6 +35,8 @@
 #include "lib/timer.h"
 #include "lib/audio_content.h"
 #include "lib/subtitle_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>
@@ -156,6 +160,10 @@ Timeline::recreate_views ()
 		if (i->subtitle) {
 			_views.push_back (shared_ptr<TimelineView> (new TimelineSubtitleContentView (*this, i)));
 		}
+
+		if (dynamic_pointer_cast<AtmosMXFContent> (i)) {
+			_views.push_back (shared_ptr<TimelineView> (new TimelineAtmosContentView (*this, i)));
+		}
 	}
 
 	assign_tracks ();
@@ -186,6 +194,36 @@ Timeline::assign_tracks ()
 		}
 	}
 
+	/* See if we have any subtitle / atmos / right-eye views */
+	bool have_3d = false;
+	bool have_subtitle = false;
+	bool have_atmos = false;
+	BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
+		shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (i);
+		if (!cv) {
+			continue;
+		}
+
+		if (dynamic_pointer_cast<TimelineVideoContentView> (i)) {
+			if (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+				have_3d = true;
+			}
+		} else if (dynamic_pointer_cast<TimelineSubtitleContentView> (i)) {
+			have_subtitle = true;
+		} else if (dynamic_pointer_cast<TimelineAtmosContentView> (i)) {
+			have_atmos = true;
+		}
+	}
+
+	_labels_view->set_3d (have_3d);
+	_labels_view->set_subtitle (have_subtitle);
+	_labels_view->set_atmos (have_atmos);
+
+	/* Hence decide where to start subtitle, atmos and audio tracks */
+	int const subtitle = have_3d ? 2 : 1;
+	int const atmos = have_subtitle ? subtitle + 1 : subtitle;
+	int const audio = have_atmos ? atmos + 1: atmos;
+
 	for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
 		shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
 		if (!cv) {
@@ -193,20 +231,21 @@ 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);
-			_tracks = max (_tracks, 2);
+			/* Video on tracks 0 and maybe 1 (left and right eye) */
+			cv->set_track (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT ? 1 : 0);
+			_tracks = max (_tracks, have_3d ? 2 : 1);
 			continue;
 		} else if (dynamic_pointer_cast<TimelineSubtitleContentView> (*i)) {
-			/* Subtitles on track 2 */
-			cv->set_track (2);
-			_tracks = max (_tracks, 3);
+			cv->set_track (subtitle);
+			_tracks = max (_tracks, subtitle + 1);
+			continue;
+		} else if (dynamic_pointer_cast<TimelineAtmosContentView> (*i)) {
+			cv->set_track (atmos);
+			_tracks = max (_tracks, atmos + 1);
 			continue;
 		}
 
-		/* Audio on tracks 3 and up */
-		int t = 3;
+		int t = audio;
 
 		shared_ptr<Content> content = cv->content();
 		DCPTimePeriod content_period (content->position(), content->end());
@@ -223,7 +262,7 @@ Timeline::assign_tracks ()
 				shared_ptr<Content> test_content = test->content();
 
 				if (test && test->track() && test->track().get() == t) {
-					if (content_period.overlaps (DCPTimePeriod(test_content->position(), test_content->end()))) {
+					if (content_period.overlap (DCPTimePeriod(test_content->position(), test_content->end()))) {
 						/* we have an overlap on track `t' */
 						++t;
 						break;
@@ -344,9 +383,9 @@ Timeline::left_up (wxMouseEvent& ev)
 
 	if (_down_view) {
 		_down_view->content()->set_change_signals_frequent (false);
-		_content_panel->set_selection (_down_view->content ());
 	}
 
+	_content_panel->set_selection (selected_content ());
 	set_position_from_event (ev);
 
 	/* Clear up up the stuff we don't do during drag */