X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=6bb216df825bdd840fd021e4ddd1ee20cd6e8451;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=a964ea98daeb507320436991212c100f6e3fcd4f;hpb=e1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index a964ea98d..6bb216df8 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2016 Carl Hetherington - 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 . */ @@ -21,9 +22,11 @@ #include "timeline.h" #include "timeline_time_axis_view.h" #include "timeline_reels_view.h" +#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_atmos_content_view.h" #include "content_panel.h" #include "wx_util.h" #include "lib/film.h" @@ -32,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 #include #include @@ -53,6 +58,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) , _film (film) , _time_axis_view (new TimelineTimeAxisView (*this, 64)) , _reels_view (new TimelineReelsView (*this, 32)) + , _labels_view (new TimelineLabelsView (*this)) , _tracks (0) , _left_down (false) , _down_view_position (0) @@ -75,6 +81,8 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) SetMinSize (wxSize (640, tracks() * track_height() + 96)); + _tracks_position = Position (_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)); } @@ -89,8 +97,28 @@ Timeline::paint () return; } - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - (*i)->paint (gc); + gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); + + BOOST_FOREACH (shared_ptr i, _views) { + + shared_ptr ic = dynamic_pointer_cast (i); + + /* Find areas of overlap */ + list > overlaps; + BOOST_FOREACH (shared_ptr j, _views) { + shared_ptr jc = dynamic_pointer_cast (j); + /* 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; + } + + optional > r = j->bbox().intersection (i->bbox()); + if (r) { + overlaps.push_back (r.get ()); + } + } + + i->paint (gc, overlaps); } delete gc; @@ -118,20 +146,23 @@ Timeline::recreate_views () _views.clear (); _views.push_back (_time_axis_view); _views.push_back (_reels_view); + _views.push_back (_labels_view); BOOST_FOREACH (shared_ptr i, film->content ()) { - if (dynamic_pointer_cast (i)) { + if (i->video) { _views.push_back (shared_ptr (new TimelineVideoContentView (*this, i))); } - shared_ptr ac = dynamic_pointer_cast (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 (new TimelineAudioContentView (*this, i))); } - shared_ptr sc = dynamic_pointer_cast (i); - if (sc && sc->has_subtitles ()) { - _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, sc))); + if (i->subtitle) { + _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, i))); + } + + if (dynamic_pointer_cast (i)) { + _views.push_back (shared_ptr (new TimelineAtmosContentView (*this, i))); } } @@ -145,7 +176,7 @@ Timeline::film_content_changed (int property, bool frequent) { ensure_ui_thread (); - if (property == AudioContentProperty::AUDIO_STREAMS) { + if (property == AudioContentProperty::STREAMS) { recreate_views (); } else if (!frequent) { setup_pixels_per_second (); @@ -163,20 +194,66 @@ 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 i, _views) { + shared_ptr cv = dynamic_pointer_cast (i); + if (!cv) { + continue; + } + + if (dynamic_pointer_cast (i)) { + if (cv->content()->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { + have_3d = true; + } + } else if (dynamic_pointer_cast (i)) { + have_subtitle = true; + } else if (dynamic_pointer_cast (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 cv = dynamic_pointer_cast (*i); if (!cv) { continue; } + if (dynamic_pointer_cast (*i)) { + /* 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 (*i)) { + cv->set_track (subtitle); + _tracks = max (_tracks, subtitle + 1); + continue; + } else if (dynamic_pointer_cast (*i)) { + cv->set_track (atmos); + _tracks = max (_tracks, atmos + 1); + continue; + } + + int t = audio; + shared_ptr content = cv->content(); DCPTimePeriod content_period (content->position(), content->end()); - int t = 0; while (true) { TimelineViewList::iterator j = _views.begin(); while (j != _views.end()) { - shared_ptr test = dynamic_pointer_cast (*j); + shared_ptr test = dynamic_pointer_cast (*j); if (!test) { ++j; continue; @@ -206,7 +283,7 @@ Timeline::assign_tracks () } _time_axis_view->set_y (tracks() * track_height() + 64); - _reels_view->set_y (tracks() * track_height() + 32); + _reels_view->set_y (8); } int @@ -223,19 +300,21 @@ Timeline::setup_pixels_per_second () return; } - _pixels_per_second = static_cast(width() - x_offset() * 2) / film->length().seconds (); + _pixels_per_second = static_cast(width() - tracks_position().x * 2) / film->length().seconds (); } shared_ptr Timeline::event_to_view (wxMouseEvent& ev) { - TimelineViewList::iterator i = _views.begin(); + /* Search backwards through views so that we find the uppermost one first */ + TimelineViewList::reverse_iterator i = _views.rbegin(); Position const p (ev.GetX(), ev.GetY()); - while (i != _views.end() && !(*i)->bbox().contains (p)) { + while (i != _views.rend() && !(*i)->bbox().contains (p)) { + shared_ptr cv = dynamic_pointer_cast (*i); ++i; } - if (i == _views.end ()) { + if (i == _views.rend ()) { return shared_ptr (); }