X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=04db5c628d4e6f148dbb6ab706ed21b857d35400;hb=afbf20b09511674ecb1db2d477236617270e556c;hp=f9205fc5d74264dc7315a7abd1b27b95b21ea2e2;hpb=a6d892268ccdf8e50194c0168491c8a360bbb687;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index f9205fc5d..04db5c628 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,31 +1,47 @@ /* - Copyright (C) 2013 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 . */ -#include -#include -#include -#include "lib/film.h" -#include "lib/playlist.h" #include "film_editor.h" #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 "repeat_dialog.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 +#include +#include using std::list; using std::cout; @@ -34,324 +50,45 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::bind; +using boost::optional; -class View : public boost::noncopyable -{ -public: - View (Timeline& t) - : _timeline (t) - { - - } - - void paint (wxGraphicsContext* g) - { - _last_paint_bbox = bbox (); - do_paint (g); - } - - void force_redraw () - { - _timeline.force_redraw (_last_paint_bbox); - _timeline.force_redraw (bbox ()); - } - - virtual dcpomatic::Rect bbox () const = 0; - -protected: - virtual void do_paint (wxGraphicsContext *) = 0; - - int time_x (Time t) const - { - return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit(); - } - - Timeline& _timeline; - -private: - dcpomatic::Rect _last_paint_bbox; -}; - -class ContentView : public View -{ -public: - ContentView (Timeline& tl, shared_ptr c, int t) - : View (tl) - , _content (c) - , _track (t) - , _selected (false) - { - _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2)); - } - - dcpomatic::Rect bbox () const - { - shared_ptr film = _timeline.film (); - if (!film) { - return dcpomatic::Rect (); - } - - return dcpomatic::Rect ( - time_x (_content->start ()) - 8, - y_pos (_track) - 8, - _content->length () * _timeline.pixels_per_time_unit() + 16, - _timeline.track_height() + 16 - ); - } - - void set_selected (bool s) { - _selected = s; - force_redraw (); - } - - bool selected () const { - return _selected; - } - - shared_ptr content () const { - return _content; - } - - void set_track (int t) { - _track = t; - } - - int track () const { - return _track; - } - - virtual wxString type () const = 0; - virtual wxColour colour () const = 0; - -private: - - void do_paint (wxGraphicsContext* gc) - { - shared_ptr film = _timeline.film (); - if (!film) { - return; - } - - Time const start = _content->start (); - Time const len = _content->length (); - - wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2); - - gc->SetPen (*wxBLACK_PEN); - - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 4, wxPENSTYLE_SOLID)); - if (_selected) { - gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (selected, wxBRUSHSTYLE_SOLID)); - } else { - gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxBRUSHSTYLE_SOLID)); - } - - wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (time_x (start), y_pos (_track) + 4); - path.AddLineToPoint (time_x (start + len), y_pos (_track) + 4); - path.AddLineToPoint (time_x (start + len), y_pos (_track + 1) - 4); - path.AddLineToPoint (time_x (start), y_pos (_track + 1) - 4); - path.AddLineToPoint (time_x (start), y_pos (_track) + 4); - gc->StrokePath (path); - gc->FillPath (path); - - wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (_content->file().filename().string()).data(), type().data()); - wxDouble name_width; - wxDouble name_height; - wxDouble name_descent; - wxDouble name_leading; - gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading); - - gc->Clip (wxRegion (time_x (start), y_pos (_track), len * _timeline.pixels_per_time_unit(), _timeline.track_height())); - gc->DrawText (name, time_x (start) + 12, y_pos (_track + 1) - name_height - 4); - gc->ResetClip (); - } - - int y_pos (int t) const - { - return _timeline.tracks_position().y + t * _timeline.track_height(); - } - - void content_changed (int p) - { - if (p == ContentProperty::START || p == ContentProperty::LENGTH) { - force_redraw (); - } - } - - /* This must be a shared_ptr, not a weak_ptr, as in the looped case this - will be the only remaining pointer to the looped content that we get - from the playlist. - */ - boost::shared_ptr _content; - int _track; - bool _selected; - - boost::signals2::scoped_connection _content_connection; -}; - -class AudioContentView : public ContentView -{ -public: - AudioContentView (Timeline& tl, shared_ptr c, int t) - : ContentView (tl, c, t) - {} - -private: - wxString type () const - { - return _("audio"); - } - - wxColour colour () const - { - return wxColour (149, 121, 232, 255); - } -}; - -class VideoContentView : public ContentView -{ -public: - VideoContentView (Timeline& tl, shared_ptr c, int t) - : ContentView (tl, c, t) - {} - -private: - - wxString type () const - { - if (dynamic_pointer_cast (content ())) { - return _("video"); - } else { - return _("still"); - } - } - - wxColour colour () const - { - return wxColour (242, 92, 120, 255); - } -}; - -class TimeAxisView : public View -{ -public: - TimeAxisView (Timeline& tl, int y) - : View (tl) - , _y (y) - {} - - dcpomatic::Rect bbox () const - { - return dcpomatic::Rect (0, _y - 4, _timeline.width(), 24); - } - - void set_y (int y) - { - _y = y; - force_redraw (); - } - -private: - - void do_paint (wxGraphicsContext* gc) - { - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); - - int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ())); - if (mark_interval > 5) { - mark_interval -= mark_interval % 5; - } - if (mark_interval > 10) { - mark_interval -= mark_interval % 10; - } - if (mark_interval > 60) { - mark_interval -= mark_interval % 60; - } - if (mark_interval > 3600) { - mark_interval -= mark_interval % 3600; - } - - if (mark_interval < 1) { - mark_interval = 1; - } - - wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (_timeline.x_offset(), _y); - path.AddLineToPoint (_timeline.width(), _y); - gc->StrokePath (path); - - Time t = 0; - while ((t * _timeline.pixels_per_time_unit()) < _timeline.width()) { - wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (time_x (t), _y - 4); - path.AddLineToPoint (time_x (t), _y + 4); - gc->StrokePath (path); - - int tc = t / TIME_HZ; - int const h = tc / 3600; - tc -= h * 3600; - int const m = tc / 60; - tc -= m * 60; - int const s = tc; - - wxString str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s); - wxDouble str_width; - wxDouble str_height; - wxDouble str_descent; - wxDouble str_leading; - gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading); - - int const tx = _timeline.x_offset() + t * _timeline.pixels_per_time_unit(); - if ((tx + str_width) < _timeline.width()) { - gc->DrawText (str, time_x (t), _y + 16); - } - - t += mark_interval * TIME_HZ; - } - } - -private: - int _y; -}; - -enum { - ID_repeat -}; - -Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr film) +Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) - , _film_editor (ed) + , _content_panel (cp) , _film (film) - , _time_axis_view (new TimeAxisView (*this, 32)) + , _time_axis_view (new TimelineTimeAxisView (*this, 64)) + , _reels_view (new TimelineReelsView (*this, 32)) + , _labels_view (new TimelineLabelsView (*this)) , _tracks (0) - , _pixels_per_time_unit (0) , _left_down (false) - , _down_view_start (0) + , _down_view_position (0) , _first_move (false) - , _menu (0) + , _menu (this) + , _snap (true) { #ifndef __WXOSX__ SetDoubleBuffered (true); -#endif +#endif - Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (Timeline::paint), 0, this); - Connect (wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler (Timeline::left_down), 0, this); - Connect (wxID_ANY, wxEVT_LEFT_UP, wxMouseEventHandler (Timeline::left_up), 0, this); - Connect (wxID_ANY, wxEVT_RIGHT_DOWN, wxMouseEventHandler (Timeline::right_down), 0, this); - Connect (wxID_ANY, wxEVT_MOTION, wxMouseEventHandler (Timeline::mouse_moved), 0, this); - Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (Timeline::resized), 0, this); - Connect (ID_repeat, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Timeline::repeat), 0, this); + Bind (wxEVT_PAINT, boost::bind (&Timeline::paint, this)); + Bind (wxEVT_LEFT_DOWN, boost::bind (&Timeline::left_down, this, _1)); + Bind (wxEVT_LEFT_UP, boost::bind (&Timeline::left_up, this, _1)); + Bind (wxEVT_RIGHT_DOWN, boost::bind (&Timeline::right_down, this, _1)); + Bind (wxEVT_MOTION, boost::bind (&Timeline::mouse_moved, this, _1)); + Bind (wxEVT_SIZE, boost::bind (&Timeline::resized, this)); - playlist_changed (); + film_changed (Film::CONTENT); SetMinSize (wxSize (640, tracks() * track_height() + 96)); - _playlist_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); + _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)); } void -Timeline::paint (wxPaintEvent &) +Timeline::paint () { wxPaintDC dc (this); @@ -360,96 +97,222 @@ Timeline::paint (wxPaintEvent &) return; } - gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); + gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); + + BOOST_FOREACH (shared_ptr i, _views) { - for (list >::iterator i = _views.begin(); i != _views.end(); ++i) { - (*i)->paint (gc); + 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; } void -Timeline::playlist_changed () +Timeline::film_changed (Film::Property p) { - shared_ptr fl = _film.lock (); - if (!fl) { + if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) { + ensure_ui_thread (); + recreate_views (); + } else if (p == Film::CONTENT_ORDER) { + Refresh (); + } +} + +void +Timeline::recreate_views () +{ + shared_ptr film = _film.lock (); + if (!film) { return; } _views.clear (); _views.push_back (_time_axis_view); + _views.push_back (_reels_view); + _views.push_back (_labels_view); - Playlist::ContentList content = fl->playlist()->content (); + BOOST_FOREACH (shared_ptr i, film->content ()) { + if (i->video) { + _views.push_back (shared_ptr (new TimelineVideoContentView (*this, i))); + } + + if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) { + _views.push_back (shared_ptr (new TimelineAudioContentView (*this, i))); + } - for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) { - if (dynamic_pointer_cast (*i)) { - _views.push_back (shared_ptr (new VideoContentView (*this, *i, 0))); + if (i->subtitle) { + _views.push_back (shared_ptr (new TimelineSubtitleContentView (*this, i))); } - if (dynamic_pointer_cast (*i)) { - _views.push_back (shared_ptr (new AudioContentView (*this, *i, 0))); + + if (dynamic_pointer_cast (i)) { + _views.push_back (shared_ptr (new TimelineAtmosContentView (*this, i))); } } assign_tracks (); - setup_pixels_per_time_unit (); + setup_pixels_per_second (); Refresh (); } void -Timeline::assign_tracks () +Timeline::film_content_changed (int property, bool frequent) { - for (list >::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); - if (cv) { - cv->set_track (0); - _tracks = 1; - } + ensure_ui_thread (); + + if (property == AudioContentProperty::STREAMS) { + recreate_views (); + } else if (!frequent) { + setup_pixels_per_second (); + Refresh (); } +} + +template +int +place (TimelineViewList& views, int& tracks) +{ + int const base = tracks; - for (list >::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr acv = dynamic_pointer_cast (*i); - if (!acv) { + BOOST_FOREACH (shared_ptr i, views) { + if (!dynamic_pointer_cast(i)) { continue; } - - shared_ptr acv_content = acv->content(); - - int t = 1; - while (1) { - list >::iterator j = _views.begin(); - while (j != _views.end()) { - shared_ptr test = dynamic_pointer_cast (*j); + + shared_ptr cv = dynamic_pointer_cast (i); + + int t = base; + + shared_ptr content = cv->content(); + 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); if (!test) { ++j; continue; } - + shared_ptr test_content = test->content(); - - if (test && test->track() == t) { - if ((acv_content->start() < test_content->start() && test_content->start() < acv_content->end()) || - (acv_content->start() < test_content->end() && test_content->end() < acv_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; } } - acv->set_track (t); - _tracks = max (_tracks, t + 1); + cv->set_track (t); + 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; } - _time_axis_view->set_y (tracks() * track_height() + 32); + /* 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); } int @@ -459,27 +322,29 @@ Timeline::tracks () const } void -Timeline::setup_pixels_per_time_unit () +Timeline::setup_pixels_per_second () { shared_ptr film = _film.lock (); - if (!film) { + if (!film || film->length() == DCPTime ()) { return; } - _pixels_per_time_unit = static_cast(width() - x_offset() * 2) / film->length (); + _pixels_per_second = static_cast(width() - tracks_position().x * 2) / film->length().seconds (); } -shared_ptr +shared_ptr Timeline::event_to_view (wxMouseEvent& ev) { - list >::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 ()) { - return shared_ptr (); + if (i == _views.rend ()) { + return shared_ptr (); } return *i; @@ -488,29 +353,25 @@ Timeline::event_to_view (wxMouseEvent& ev) void Timeline::left_down (wxMouseEvent& ev) { - shared_ptr view = event_to_view (ev); - shared_ptr content_view = dynamic_pointer_cast (view); + shared_ptr view = event_to_view (ev); + shared_ptr content_view = dynamic_pointer_cast (view); _down_view.reset (); if (content_view) { _down_view = content_view; - _down_view_start = content_view->content()->start (); + _down_view_position = content_view->content()->position (); } - for (list >::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); + for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) { + shared_ptr cv = dynamic_pointer_cast (*i); if (!cv) { continue; } - + if (!ev.ShiftDown ()) { cv->set_selected (view == *i); } - - if (view == *i) { - _film_editor->set_selection (cv->content ()); - } } if (content_view && ev.ShiftDown ()) { @@ -522,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); } } @@ -535,7 +414,16 @@ Timeline::left_up (wxMouseEvent& ev) _down_view->content()->set_change_signals_frequent (false); } - set_start_from_event (ev); + _content_panel->set_selection (selected_content ()); + set_position_from_event (ev); + + /* 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 @@ -545,14 +433,14 @@ Timeline::mouse_moved (wxMouseEvent& ev) return; } - set_start_from_event (ev); + set_position_from_event (ev); } void Timeline::right_down (wxMouseEvent& ev) { - shared_ptr view = event_to_view (ev); - shared_ptr cv = dynamic_pointer_cast (view); + shared_ptr view = event_to_view (ev); + shared_ptr cv = dynamic_pointer_cast (view); if (!cv) { return; } @@ -562,20 +450,33 @@ Timeline::right_down (wxMouseEvent& ev) cv->set_selected (true); } - if (!_menu) { - _menu = new wxMenu; - _menu->Append (ID_repeat, _("Repeat...")); - } + _menu.popup (_film, selected_content (), selected_views (), ev.GetPosition ()); +} - PopupMenu (_menu, ev.GetPosition ()); +void +Timeline::maybe_snap (DCPTime a, DCPTime b, optional& nearest_distance) const +{ + DCPTime const d = a - b; + if (!nearest_distance || d.abs() < nearest_distance.get().abs()) { + nearest_distance = d; + } } void -Timeline::set_start_from_event (wxMouseEvent& ev) +Timeline::set_position_from_event (wxMouseEvent& ev) { + if (!_pixels_per_second) { + return; + } + + double const pps = _pixels_per_second.get (); + wxPoint const p = ev.GetPosition(); if (!_first_move) { + /* We haven't moved yet; in that case, we must move the mouse some reasonable distance + before the drag is considered to have started. + */ int const dist = sqrt (pow (p.x - _down_point.x, 2) + pow (p.y - _down_point.y, 2)); if (dist < 8) { return; @@ -583,14 +484,47 @@ Timeline::set_start_from_event (wxMouseEvent& ev) _first_move = true; } - Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit; - if (_down_view) { - _down_view->content()->set_start (max (static_cast