X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=04db5c628d4e6f148dbb6ab706ed21b857d35400;hb=56209810c3a8510b5c0ad74dfc8ac5f5a69ea1ef;hp=31981deea7b4129e590715ca0a6146e2031f0839;hpb=6f344b876689a1234a5eb75041882f06f5d9fe5c;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 31981deea..04db5c628 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 . */ @@ -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 #include #include @@ -149,14 +153,16 @@ Timeline::recreate_views () _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))); } } @@ -170,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 (); @@ -178,73 +184,133 @@ Timeline::film_content_changed (int property, bool frequent) } } -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; } - if (dynamic_pointer_cast (*i)) { - /* Video on tracks 0 and 1 (left and right eye) */ - shared_ptr vc = dynamic_pointer_cast (cv->content ()); - cv->set_track (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT ? 1 : 0); - _tracks = max (_tracks, 2); - continue; - } else if (dynamic_pointer_cast (*i)) { - /* Subtitles on track 2 */ - cv->set_track (2); - _tracks = max (_tracks, 3); - continue; - } + shared_ptr cv = dynamic_pointer_cast (i); - /* Audio on tracks 3 and up */ - int t = 3; + int t = base; shared_ptr 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 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 (8); } @@ -346,9 +412,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 */