X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=04db5c628d4e6f148dbb6ab706ed21b857d35400;hb=56209810c3a8510b5c0ad74dfc8ac5f5a69ea1ef;hp=8a61eccb07e39b3736fa527f313079fd80b46018;hpb=a1839a88ab0cffdf04737dae783c21f27f65d491;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 8a61eccb0..04db5c628 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + 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,16 +22,21 @@ #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" #include "lib/playlist.h" #include "lib/image_content.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 #include #include @@ -52,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) @@ -74,8 +81,10 @@ 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)); + _film_content_changed_connection = film->ContentChanged.connect (bind (&Timeline::film_content_changed, this, _2, _3)); } void @@ -88,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; @@ -102,11 +131,6 @@ Timeline::film_changed (Film::Property p) ensure_ui_thread (); recreate_views (); } else if (p == Film::CONTENT_ORDER) { - assign_tracks (); - if (!_left_down) { - /* Only do this if we are not dragging, as it's confusing otherwise */ - setup_pixels_per_second (); - } Refresh (); } } @@ -122,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,69 +172,147 @@ Timeline::recreate_views () } void -Timeline::film_content_changed (int property) +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 (); + Refresh (); } } -void -Timeline::assign_tracks () +template +int +place (TimelineViewList& views, int& tracks) { - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr c = dynamic_pointer_cast (*i); - if (c) { - c->unset_track (); - } - } + int const base = tracks; - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); - if (!cv) { + BOOST_FOREACH (shared_ptr i, views) { + if (!dynamic_pointer_cast(i)) { continue; } + shared_ptr cv = dynamic_pointer_cast (i); + + int t = base; + shared_ptr content = cv->content(); - DCPTimePeriod content_period (content->position(), content->end()); + DCPTimePeriod const 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); + TimelineViewList::iterator j = views.begin(); + while (j != views.end()) { + shared_ptr test = dynamic_pointer_cast (*j); if (!test) { ++j; continue; } shared_ptr 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 c = dynamic_pointer_cast (*i); + if (c) { + c->unset_track (); + } + } + + /* Video */ + + bool have_3d = false; + BOOST_FOREACH (shared_ptr i, _views) { + shared_ptr cv = dynamic_pointer_cast (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 (_views, _tracks); + + /* Atmos */ + + 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)) { + cv->set_track (_tracks - 1); + have_atmos = true; + } + } + + if (have_atmos) { + ++_tracks; + } + + /* Audio */ + + place (_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 @@ -224,19 +329,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 (); } @@ -265,10 +372,6 @@ Timeline::left_down (wxMouseEvent& ev) if (!ev.ShiftDown ()) { cv->set_selected (view == *i); } - - if (view == *i) { - _content_panel->set_selection (cv->content ()); - } } if (content_view && ev.ShiftDown ()) { @@ -280,6 +383,24 @@ Timeline::left_down (wxMouseEvent& ev) _first_move = false; if (_down_view) { + /* Pre-compute the points that we might snap to */ + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (!cv || cv == _down_view || cv->content() == _down_view->content()) { + continue; + } + + _start_snaps.push_back (cv->content()->position()); + _end_snaps.push_back (cv->content()->position()); + _start_snaps.push_back (cv->content()->end()); + _end_snaps.push_back (cv->content()->end()); + + BOOST_FOREACH (DCPTime i, cv->content()->reel_split_points()) { + _start_snaps.push_back (i); + } + } + + /* Tell everyone that things might change frequently during the drag */ _down_view->content()->set_change_signals_frequent (true); } } @@ -293,13 +414,16 @@ Timeline::left_up (wxMouseEvent& ev) _down_view->content()->set_change_signals_frequent (false); } + _content_panel->set_selection (selected_content ()); set_position_from_event (ev); - /* We don't do this during drag, and set_position_from_event above - might not have changed the position, so do it now. - */ + /* Clear up up the stuff we don't do during drag */ + assign_tracks (); setup_pixels_per_second (); Refresh (); + + _start_snaps.clear (); + _end_snaps.clear (); } void @@ -374,17 +498,14 @@ Timeline::set_position_from_event (wxMouseEvent& ev) */ optional nearest_distance; - /* Find the nearest content edge; this is inefficient */ - for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); - if (!cv || cv == _down_view || cv->content() == _down_view->content()) { - continue; - } + /* Find the nearest snap point */ + + BOOST_FOREACH (DCPTime i, _start_snaps) { + maybe_snap (i, new_position, nearest_distance); + } - maybe_snap (cv->content()->position(), new_position, nearest_distance); - maybe_snap (cv->content()->position(), new_end, nearest_distance); - maybe_snap (cv->content()->end(), new_position, nearest_distance); - maybe_snap (cv->content()->end(), new_end, nearest_distance); + BOOST_FOREACH (DCPTime i, _end_snaps) { + maybe_snap (i, new_end, nearest_distance); } if (nearest_distance) { @@ -403,7 +524,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - film->set_sequence_video (false); + film->set_sequence (false); } void @@ -462,3 +583,14 @@ Timeline::selected_content () const return sel; } + +void +Timeline::set_selection (ContentList selection) +{ + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (cv) { + cv->set_selected (find (selection.begin(), selection.end(), cv->content ()) != selection.end ()); + } + } +}