Rename TimelineView -> ContentTimelineView.

13 files changed, 39 insertions, 37 deletions

diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc
index b650f8e92..368cbcca4 100644
--- a/src/wx/content_timeline.cc
+++ b/src/wx/content_timeline.cc
@@ -356,7 +356,7 @@ ContentTimeline::film_content_change(ChangeType type, int property, bool frequen
 
 template <class T>
 int
-place (shared_ptr<const Film> film, TimelineViewList& views, int& tracks)
+place(shared_ptr<const Film> film, ContentTimelineViewList& views, int& tracks)
 {
 	int const base = tracks;
 
@@ -413,7 +413,7 @@ place (shared_ptr<const Film> film, TimelineViewList& views, int& tracks)
  *  order of first mapped DCP channel.
  */
 struct AudioMappingComparator {
-	bool operator()(shared_ptr<TimelineView> a, shared_ptr<TimelineView> b) {
+	bool operator()(shared_ptr<ContentTimelineView> a, shared_ptr<ContentTimelineView> b) {
 		int la = -1;
 		auto cva = dynamic_pointer_cast<TimelineAudioContentView>(a);
 		if (cva) {
@@ -519,7 +519,7 @@ ContentTimeline::setup_scrollbars()
 }
 
 
-shared_ptr<TimelineView>
+shared_ptr<ContentTimelineView>
 ContentTimeline::event_to_view(wxMouseEvent& ev)
 {
 	/* Search backwards through views so that we find the uppermost one first */
diff --git a/src/wx/content_timeline.h b/src/wx/content_timeline.h
index 65b2ff956..994f18ad4 100644
--- a/src/wx/content_timeline.h
+++ b/src/wx/content_timeline.h
@@ -31,12 +31,12 @@ LIBDCP_ENABLE_WARNINGS
 
 
 class ContentPanel;
+class ContentTimelineView;
 class Film;
 class FilmViewer;
 class TimelineLabelsView;
 class TimelineReelsView;
 class TimelineTimeAxisView;
-class TimelineView;
 
 
 class ContentTimeline : public wxPanel
@@ -112,7 +112,7 @@ private:
 	void update_playhead ();
 	void mouse_wheel_turned(wxMouseEvent& event);
 
-	std::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
+	std::shared_ptr<ContentTimelineView> event_to_view(wxMouseEvent &);
 	TimelineContentViewList selected_views () const;
 	ContentList selected_content () const;
 	void maybe_snap (dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::DCPTime>& nearest_distance) const;
@@ -122,7 +122,7 @@ private:
 	ContentPanel* _content_panel;
 	std::weak_ptr<Film> _film;
 	FilmViewer& _viewer;
-	TimelineViewList _views;
+	ContentTimelineViewList _views;
 	std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
 	std::shared_ptr<TimelineReelsView> _reels_view;
 	std::shared_ptr<TimelineLabelsView> _labels_view;
diff --git a/src/wx/timeline_view.cc b/src/wx/content_timeline_view.cc
index f81ddd413..05922d558 100644
--- a/src/wx/timeline_view.cc
+++ b/src/wx/content_timeline_view.cc
@@ -20,17 +20,17 @@
 
 
 #include "content_timeline.h"
-#include "timeline_view.h"
+#include "content_timeline_view.h"
 
 
 using std::list;
 using namespace dcpomatic;
 
 
-/** @class TimelineView
- *  @brief Parent class for components of the timeline (e.g. a piece of content or an axis).
+/** @class ContentContentTimelineView
+ *  @brief Parent class for components of the content timeline (e.g. a piece of content or an axis).
  */
-TimelineView::TimelineView(ContentTimeline& t)
+ContentTimelineView::ContentTimelineView(ContentTimeline& t)
 	: _timeline (t)
 {
 
@@ -38,7 +38,7 @@ TimelineView::TimelineView(ContentTimeline& t)
 
 
 void
-TimelineView::paint (wxGraphicsContext* g, list<dcpomatic::Rect<int>> overlaps)
+ContentTimelineView::paint(wxGraphicsContext* g, list<dcpomatic::Rect<int>> overlaps)
 {
 	_last_paint_bbox = bbox ();
 	do_paint (g, overlaps);
@@ -46,7 +46,7 @@ TimelineView::paint (wxGraphicsContext* g, list<dcpomatic::Rect<int>> overlaps)
 
 
 void
-TimelineView::force_redraw ()
+ContentTimelineView::force_redraw()
 {
 	_timeline.force_redraw (_last_paint_bbox.extended(4));
 	_timeline.force_redraw (bbox().extended(4));
@@ -54,14 +54,14 @@ TimelineView::force_redraw ()
 
 
 int
-TimelineView::time_x (DCPTime t) const
+ContentTimelineView::time_x(DCPTime t) const
 {
 	return t.seconds() * _timeline.pixels_per_second().get_value_or(0);
 }
 
 
 int
-TimelineView::y_pos(int t) const
+ContentTimelineView::y_pos(int t) const
 {
 	return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
 }
diff --git a/src/wx/timeline_view.h b/src/wx/content_timeline_view.h
index e753255e3..0f6eeae51 100644
--- a/src/wx/timeline_view.h
+++ b/src/wx/content_timeline_view.h
@@ -19,8 +19,8 @@
 */
 
 
-#ifndef DCPOMATIC_TIMELINE_VIEW_H
-#define DCPOMATIC_TIMELINE_VIEW_H
+#ifndef DCPOMATIC_CONTENT_TIMELINE_VIEW_H
+#define DCPOMATIC_CONTENT_TIMELINE_VIEW_H
 
 
 #include "lib/rect.h"
@@ -31,17 +31,17 @@ class wxGraphicsContext;
 class ContentTimeline;
 
 
-/** @class TimelineView
- *  @brief Parent class for components of the timeline (e.g. a piece of content or an axis).
+/** @class ContentTimelineView
+ *  @brief Parent class for components of the content timeline (e.g. a piece of content or an axis).
  */
-class TimelineView
+class ContentTimelineView
 {
 public:
-	explicit TimelineView(ContentTimeline& t);
-	virtual ~TimelineView () {}
+	explicit ContentTimelineView(ContentTimeline& t);
+	virtual ~ContentTimelineView () = default;
 
-	TimelineView (TimelineView const&) = delete;
-	TimelineView& operator= (TimelineView const&) = delete;
+	ContentTimelineView(ContentTimelineView const&) = delete;
+	ContentTimelineView& operator=(ContentTimelineView const&) = delete;
 
 	void paint (wxGraphicsContext* g, std::list<dcpomatic::Rect<int>> overlaps);
 	void force_redraw ();
@@ -61,7 +61,7 @@ private:
 };
 
 
-typedef std::vector<std::shared_ptr<TimelineView>> TimelineViewList;
+typedef std::vector<std::shared_ptr<ContentTimelineView>> ContentTimelineViewList;
 
 
 #endif
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 05ee6617b..cb0d10240 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -38,7 +38,7 @@ using namespace boost::placeholders;
 
 
 TimelineContentView::TimelineContentView(ContentTimeline& tl, shared_ptr<Content> c)
-	: TimelineView (tl)
+	: ContentTimelineView(tl)
 	, _content (c)
 {
 	_content_connection = c->Change.connect (bind (&TimelineContentView::content_change, this, _1, _3));
diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index ac84214f0..7b206d30f 100644
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -23,7 +23,7 @@
 #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
 
 
-#include "timeline_view.h"
+#include "content_timeline_view.h"
 #include "lib/change_signaller.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
@@ -37,7 +37,7 @@ class Content;
 /** @class TimelineContentView
  *  @brief Parent class for views of pieces of content.
  */
-class TimelineContentView : public TimelineView
+class TimelineContentView : public ContentTimelineView
 {
 public:
 	TimelineContentView(ContentTimeline& tl, std::shared_ptr<Content> c);
diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index 48c879d13..c869d7ec5 100644
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -35,7 +35,7 @@ using std::min;
 
 
 TimelineLabelsView::TimelineLabelsView(ContentTimeline& tl)
-	: TimelineView (tl)
+	: ContentTimelineView(tl)
 {
 	wxString labels[] = {
 		_("Video"),
diff --git a/src/wx/timeline_labels_view.h b/src/wx/timeline_labels_view.h
index 1fa5b60b1..324531c39 100644
--- a/src/wx/timeline_labels_view.h
+++ b/src/wx/timeline_labels_view.h
@@ -19,13 +19,13 @@
 */
 
 
-#include "timeline_view.h"
+#include "content_timeline_view.h"
 
 
 class wxWindow;
 
 
-class TimelineLabelsView : public TimelineView
+class TimelineLabelsView : public ContentTimelineView
 {
 public:
 	explicit TimelineLabelsView(ContentTimeline& tl);
diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index 34ce96a4e..5f2a78079 100644
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -36,7 +36,7 @@ using namespace dcpomatic;
 
 
 TimelineReelsView::TimelineReelsView(ContentTimeline& tl, int y)
-	: TimelineView (tl)
+	: ContentTimelineView(tl)
 	, _y (y)
 {
 
diff --git a/src/wx/timeline_reels_view.h b/src/wx/timeline_reels_view.h
index 670df7c9d..7dbc34308 100644
--- a/src/wx/timeline_reels_view.h
+++ b/src/wx/timeline_reels_view.h
@@ -19,10 +19,10 @@
 */
 
 
-#include "timeline_view.h"
+#include "content_timeline_view.h"
 
 
-class TimelineReelsView : public TimelineView
+class TimelineReelsView : public ContentTimelineView
 {
 public:
 	TimelineReelsView(ContentTimeline& tl, int y);
diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index b17b274b2..d9b7710c6 100644
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -35,7 +35,7 @@ using namespace dcpomatic;
 
 
 TimelineTimeAxisView::TimelineTimeAxisView(ContentTimeline& tl, int y)
-	: TimelineView (tl)
+	: ContentTimelineView(tl)
 	, _y (y)
 {
 
diff --git a/src/wx/timeline_time_axis_view.h b/src/wx/timeline_time_axis_view.h
index 6ffb9e5dc..f89121776 100644
--- a/src/wx/timeline_time_axis_view.h
+++ b/src/wx/timeline_time_axis_view.h
@@ -18,9 +18,11 @@
 
 */
 
-#include "timeline_view.h"
 
-class TimelineTimeAxisView : public TimelineView
+#include "content_timeline_view.h"
+
+
+class TimelineTimeAxisView : public ContentTimelineView
 {
 public:
 	TimelineTimeAxisView(ContentTimeline& tl, int y);
diff --git a/src/wx/wscript b/src/wx/wscript
index abf260ad6..830d76731 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -49,6 +49,7 @@ sources = """
           content_properties_dialog.cc
           content_sub_panel.cc
           content_timeline.cc
+          content_timeline_view.cc
           content_version_dialog.cc
           content_view.cc
           controls.cc
@@ -170,7 +171,6 @@ sources = """
           timeline_reels_view.cc
           timeline_time_axis_view.cc
           timeline_video_content_view.cc
-          timeline_view.cc
           timing_panel.cc
           try_unmount_dialog.cc
           update_dialog.cc