/*
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/>.
*/
#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"
#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>
SetMinSize (wxSize (640, tracks() * track_height() + 96));
- _tracks_position = Position<int> (_labels_view->bbox().width, 8);
+ _tracks_position = Position<int> (_labels_view->bbox().width, 32);
_film_changed_connection = film->Changed.connect (bind (&Timeline::film_changed, this, _1));
_film_content_changed_connection = film->ContentChanged.connect (bind (&Timeline::film_content_changed, this, _2, _3));
return;
}
+ gc->SetAntialiasMode (wxANTIALIAS_DEFAULT);
BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
list<dcpomatic::Rect<int> > overlaps;
BOOST_FOREACH (shared_ptr<TimelineView> j, _views) {
shared_ptr<TimelineContentView> jc = dynamic_pointer_cast<TimelineContentView> (j);
- if (!ic || !jc || i == j || ic->track() != jc->track() || !ic->active() || !jc->active()) {
+ /* No overlap with non-content views, views no different tracks, audio views or non-active views */
+ if (!ic || !jc || i == j || ic->track() != jc->track() || ic->track().get_value_or(2) >= 2 || !ic->active() || !jc->active()) {
continue;
}
_views.push_back (_labels_view);
BOOST_FOREACH (shared_ptr<Content> i, film->content ()) {
- if (dynamic_pointer_cast<VideoContent> (i)) {
+ if (i->video) {
_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)));
}
- shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (i);
- if (sc && sc->has_subtitles ()) {
- _views.push_back (shared_ptr<TimelineView> (new TimelineSubtitleContentView (*this, sc)));
+ 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)));
}
}
{
ensure_ui_thread ();
- if (property == AudioContentProperty::AUDIO_STREAMS) {
+ if (property == AudioContentProperty::STREAMS) {
recreate_views ();
} else if (!frequent) {
setup_pixels_per_second ();
}
}
-void
-Timeline::assign_tracks ()
+template <class T>
+int
+place (TimelineViewList& views, int& tracks)
{
- for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
- shared_ptr<TimelineContentView> c = dynamic_pointer_cast<TimelineContentView> (*i);
- if (c) {
- c->unset_track ();
- }
- }
+ int const base = tracks;
- for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
- shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
- if (!cv) {
+ BOOST_FOREACH (shared_ptr<TimelineView> i, views) {
+ if (!dynamic_pointer_cast<T>(i)) {
continue;
}
- if (dynamic_pointer_cast<TimelineVideoContentView> (*i)) {
- /* Video on track 0 */
- cv->set_track (0);
- _tracks = max (_tracks, 1);
- continue;
- } else if (dynamic_pointer_cast<TimelineSubtitleContentView> (*i)) {
- /* Subtitles on track 1 */
- cv->set_track (1);
- _tracks = max (_tracks, 2);
- continue;
- }
+ shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (i);
- /* Audio on tracks 2 and up */
- int t = 2;
+ int t = base;
shared_ptr<Content> content = cv->content();
- DCPTimePeriod content_period (content->position(), content->end());
+ DCPTimePeriod const content_period (content->position(), content->end());
while (true) {
- TimelineViewList::iterator j = _views.begin();
- while (j != _views.end()) {
- shared_ptr<TimelineAudioContentView> test = dynamic_pointer_cast<TimelineAudioContentView> (*j);
+ TimelineViewList::iterator j = views.begin();
+ while (j != views.end()) {
+ shared_ptr<T> test = dynamic_pointer_cast<T> (*j);
if (!test) {
++j;
continue;
}
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()))) {
- /* we have an overlap on track `t' */
- ++t;
- break;
- }
+ if (
+ test->track() && test->track().get() == t &&
+ content_period.overlap(DCPTimePeriod(test_content->position(), test_content->end()))) {
+ /* we have an overlap on track `t' */
+ ++t;
+ break;
}
++j;
}
- if (j == _views.end ()) {
+ if (j == views.end ()) {
/* no overlap on `t' */
break;
}
}
cv->set_track (t);
- _tracks = max (_tracks, t + 1);
+ tracks = max (tracks, t + 1);
}
+ return tracks - base;
+}
+
+void
+Timeline::assign_tracks ()
+{
+ /* Tracks are:
+ Video (mono or left-eye)
+ Video (right-eye)
+ Subtitle 1
+ Subtitle 2
+ Subtitle N
+ Atmos
+ Audio 1
+ Audio 2
+ Audio N
+ */
+
+ _tracks = 0;
+
+ for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
+ shared_ptr<TimelineContentView> c = dynamic_pointer_cast<TimelineContentView> (*i);
+ if (c) {
+ c->unset_track ();
+ }
+ }
+
+ /* Video */
+
+ bool have_3d = false;
+ BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
+ shared_ptr<TimelineVideoContentView> cv = dynamic_pointer_cast<TimelineVideoContentView> (i);
+ if (!cv) {
+ continue;
+ }
+
+ /* Video on tracks 0 and maybe 1 (left and right eye) */
+ if (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+ cv->set_track (1);
+ _tracks = max (_tracks, 2);
+ have_3d = true;
+ } else {
+ cv->set_track (0);
+ }
+ }
+
+ _tracks = max (_tracks, 1);
+
+ /* Subtitle */
+
+ int const subtitle_tracks = place<TimelineSubtitleContentView> (_views, _tracks);
+
+ /* Atmos */
+
+ bool have_atmos = false;
+ BOOST_FOREACH (shared_ptr<TimelineView> i, _views) {
+ shared_ptr<TimelineVideoContentView> cv = dynamic_pointer_cast<TimelineVideoContentView> (i);
+ if (!cv) {
+ continue;
+ }
+ if (dynamic_pointer_cast<TimelineAtmosContentView> (i)) {
+ cv->set_track (_tracks - 1);
+ have_atmos = true;
+ }
+ }
+
+ if (have_atmos) {
+ ++_tracks;
+ }
+
+ /* Audio */
+
+ place<TimelineAudioContentView> (_views, _tracks);
+
+ _labels_view->set_3d (have_3d);
+ _labels_view->set_subtitle_tracks (subtitle_tracks);
+ _labels_view->set_atmos (have_atmos);
+
_time_axis_view->set_y (tracks() * track_height() + 64);
- _reels_view->set_y (tracks() * track_height() + 32);
+ _reels_view->set_y (8);
}
int
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 */
projects / dcpomatic.git / blobdiff