#include "film_editor.h"
#include "timeline.h"
#include "timeline_time_axis_view.h"
+#include "timeline_reels_view.h"
#include "timeline_video_content_view.h"
#include "timeline_audio_content_view.h"
#include "timeline_subtitle_content_view.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 <wx/graphics.h>
#include <boost/weak_ptr.hpp>
+#include <boost/foreach.hpp>
#include <list>
+#include <iostream>
using std::list;
using std::cout;
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
, _content_panel (cp)
, _film (film)
- , _time_axis_view (new TimelineTimeAxisView (*this, 32))
+ , _time_axis_view (new TimelineTimeAxisView (*this, 64))
+ , _reels_view (new TimelineReelsView (*this, 32))
, _tracks (0)
, _left_down (false)
, _down_view_position (0)
void
Timeline::film_changed (Film::Property p)
{
- if (p == Film::CONTENT) {
+ if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) {
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 ();
}
}
_views.clear ();
_views.push_back (_time_axis_view);
+ _views.push_back (_reels_view);
- ContentList content = film->content ();
-
- for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
- if (dynamic_pointer_cast<VideoContent> (*i)) {
- _views.push_back (shared_ptr<TimelineView> (new TimelineVideoContentView (*this, *i)));
+ BOOST_FOREACH (shared_ptr<Content> i, film->content ()) {
+ if (dynamic_pointer_cast<VideoContent> (i)) {
+ _views.push_back (shared_ptr<TimelineView> (new TimelineVideoContentView (*this, i)));
}
- shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (*i);
+ shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (i);
if (ac && !ac->audio_mapping().mapped_output_channels().empty ()) {
- _views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, *i)));
+ _views.push_back (shared_ptr<TimelineView> (new TimelineAudioContentView (*this, i)));
}
- shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (*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)));
}
{
ensure_ui_thread ();
- if (property == ContentProperty::POSITION) {
- assign_tracks ();
- if (!_left_down) {
- /* Only do this if we are not dragging, as it's confusing otherwise */
- setup_pixels_per_second ();
- }
- Refresh ();
- } else if (property == AudioContentProperty::AUDIO_STREAMS) {
+ if (property == AudioContentProperty::AUDIO_STREAMS) {
recreate_views ();
}
}
}
shared_ptr<Content> content = cv->content();
+ DCPTimePeriod content_period (content->position(), content->end());
int t = 0;
while (true) {
shared_ptr<Content> test_content = test->content();
if (test && test->track() && test->track().get() == t) {
- bool const no_overlap =
- (content->position() < test_content->position() && content->end() < test_content->position()) ||
- (content->position() > test_content->end() && content->end() > test_content->end());
-
- if (!no_overlap) {
+ if (content_period.overlaps (DCPTimePeriod(test_content->position(), test_content->end()))) {
/* we have an overlap on track `t' */
++t;
break;
_tracks = max (_tracks, t + 1);
}
- _time_axis_view->set_y (tracks() * track_height() + 32);
+ _time_axis_view->set_y (tracks() * track_height() + 64);
+ _reels_view->set_y (tracks() * track_height() + 32);
}
int
if (!ev.ShiftDown ()) {
cv->set_selected (view == *i);
}
-
- if (view == *i) {
- _content_panel->set_selection (cv->content ());
- }
}
if (content_view && ev.ShiftDown ()) {
_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<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*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);
}
}
if (_down_view) {
_down_view->content()->set_change_signals_frequent (false);
+ _content_panel->set_selection (_down_view->content ());
}
set_position_from_event (ev);
*/
setup_pixels_per_second ();
Refresh ();
+
+ _start_snaps.clear ();
+ _end_snaps.clear ();
}
void
if (_snap) {
- DCPTime const new_end = new_position + _down_view->content()->length_after_trim () - DCPTime (1);
+ DCPTime const new_end = new_position + _down_view->content()->length_after_trim();
/* Signed `distance' to nearest thing (i.e. negative is left on the timeline,
positive is right).
*/
optional<DCPTime> nearest_distance;
- /* Find the nearest content edge; this is inefficient */
- for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
- shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
- if (!cv || cv == _down_view || cv->content() == _down_view->content()) {
- continue;
- }
+ /* Find the nearest snap point */
- maybe_snap (cv->content()->position(), new_position, nearest_distance);
- maybe_snap (cv->content()->position(), new_end + DCPTime (1), nearest_distance);
- maybe_snap (cv->content()->end() + DCPTime (1), new_position, nearest_distance);
- maybe_snap (cv->content()->end() + DCPTime (1), new_end, nearest_distance);
+ BOOST_FOREACH (DCPTime i, _start_snaps) {
+ maybe_snap (i, new_position, nearest_distance);
+ }
+
+ BOOST_FOREACH (DCPTime i, _end_snaps) {
+ maybe_snap (i, new_end, nearest_distance);
}
if (nearest_distance) {
return sel;
}
+
+void
+Timeline::set_selection (ContentList selection)
+{
+ for (TimelineViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
+ shared_ptr<TimelineContentView> cv = dynamic_pointer_cast<TimelineContentView> (*i);
+ if (cv) {
+ cv->set_selected (find (selection.begin(), selection.end(), cv->content ()) != selection.end ());
+ }
+ }
+}
projects / dcpomatic.git / blobdiff