Rename TimelineVideoContentView -> ContentTimelineVideoView.

5 files changed, 17 insertions, 17 deletions

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 9f89835ff..9c50d56da 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -24,12 +24,12 @@
 #include "content_menu.h"
 #include "content_properties_dialog.h"
 #include "content_timeline_audio_view.h"
+#include "content_timeline_video_view.h"
 #include "dir_dialog.h"
 #include "file_dialog.h"
 #include "film_viewer.h"
 #include "id.h"
 #include "repeat_dialog.h"
-#include "timeline_video_content_view.h"
 #include "wx_util.h"
 #include "lib/audio_content.h"
 #include "lib/config.h"
@@ -314,11 +314,11 @@ ContentMenu::remove ()
 				continue;
 			}
 
-			shared_ptr<TimelineVideoContentView> video;
+			shared_ptr<ContentTimelineVideoView> video;
 			shared_ptr<ContentTimelineAudioView> audio;
 
 			for (auto j: _views) {
-				auto v = dynamic_pointer_cast<TimelineVideoContentView>(j);
+				auto v = dynamic_pointer_cast<ContentTimelineVideoView>(j);
 				auto a = dynamic_pointer_cast<ContentTimelineAudioView>(j);
 				if (v && v->content() == fc) {
 					video = v;
diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc
index 3efb15d3f..5e104f3b7 100644
--- a/src/wx/content_timeline.cc
+++ b/src/wx/content_timeline.cc
@@ -24,11 +24,11 @@
 #include "film_viewer.h"
 #include "content_timeline_atmos_view.h"
 #include "content_timeline_audio_view.h"
+#include "content_timeline_video_view.h"
 #include "timeline_labels_view.h"
 #include "timeline_reels_view.h"
 #include "timeline_text_content_view.h"
 #include "timeline_time_axis_view.h"
-#include "timeline_video_content_view.h"
 #include "wx_util.h"
 #include "lib/atmos_mxf_content.h"
 #include "lib/audio_content.h"
@@ -303,7 +303,7 @@ ContentTimeline::recreate_views()
 
 	for (auto i: film->content ()) {
 		if (i->video) {
-			_views.push_back (make_shared<TimelineVideoContentView>(*this, i));
+			_views.push_back(make_shared<ContentTimelineVideoView>(*this, i));
 		}
 
 		if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) {
@@ -450,7 +450,7 @@ ContentTimeline::assign_tracks()
 		}
 	}
 
-	int const video_tracks = place<TimelineVideoContentView> (film, _views, _tracks);
+	int const video_tracks = place<ContentTimelineVideoView>(film, _views, _tracks);
 	int const text_tracks = place<TimelineTextContentView> (film, _views, _tracks);
 
 	/* Atmos */
diff --git a/src/wx/timeline_video_content_view.cc b/src/wx/content_timeline_video_view.cc
index d72b1e149..63b26a570 100644
--- a/src/wx/timeline_video_content_view.cc
+++ b/src/wx/content_timeline_video_view.cc
@@ -21,21 +21,21 @@
 
 #include "lib/image_content.h"
 #include "lib/video_content.h"
-#include "timeline_video_content_view.h"
+#include "content_timeline_video_view.h"
 
 
 using std::dynamic_pointer_cast;
 using std::shared_ptr;
 
 
-TimelineVideoContentView::TimelineVideoContentView(ContentTimeline& tl, shared_ptr<Content> c)
+ContentTimelineVideoView::ContentTimelineVideoView(ContentTimeline& tl, shared_ptr<Content> c)
 	: TimelineContentView (tl, c)
 {
 
 }
 
 wxColour
-TimelineVideoContentView::background_colour () const
+ContentTimelineVideoView::background_colour() const
 {
 	if (!active()) {
 		return wxColour (210, 210, 210, 128);
@@ -45,7 +45,7 @@ TimelineVideoContentView::background_colour () const
 }
 
 wxColour
-TimelineVideoContentView::foreground_colour () const
+ContentTimelineVideoView::foreground_colour() const
 {
 	if (!active()) {
 		return wxColour (180, 180, 180, 128);
@@ -55,9 +55,9 @@ TimelineVideoContentView::foreground_colour () const
 }
 
 bool
-TimelineVideoContentView::active () const
+ContentTimelineVideoView::active() const
 {
-	shared_ptr<Content> c = _content.lock ();
+	auto c = _content.lock();
 	DCPOMATIC_ASSERT (c);
 	return c->video && c->video->use();
 }
diff --git a/src/wx/timeline_video_content_view.h b/src/wx/content_timeline_video_view.h
index 507f3caed..940a1a305 100644
--- a/src/wx/timeline_video_content_view.h
+++ b/src/wx/content_timeline_video_view.h
@@ -22,13 +22,13 @@
 #include "timeline_content_view.h"
 
 
-/** @class TimelineVideoContentView
- *  @brief Timeline view for VideoContent.
+/** @class ContentTimelineVideoView
+ *  @brief Content timeline view for VideoContent.
  */
-class TimelineVideoContentView : public TimelineContentView
+class ContentTimelineVideoView : public TimelineContentView
 {
 public:
-	TimelineVideoContentView(ContentTimeline& tl, std::shared_ptr<Content> c);
+	ContentTimelineVideoView(ContentTimeline& tl, std::shared_ptr<Content> c);
 
 private:
 	bool active () const override;
diff --git a/src/wx/wscript b/src/wx/wscript
index c2bcd72c5..a3e3c06ed 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -52,6 +52,7 @@ sources = """
           content_timeline_atmos_view.cc
           content_timeline_audio_view.cc
           content_timeline_dialog.cc
+          content_timeline_video_view.cc
           content_timeline_view.cc
           content_version_dialog.cc
           content_view.cc
@@ -171,7 +172,6 @@ sources = """
           timeline_text_content_view.cc
           timeline_reels_view.cc
           timeline_time_axis_view.cc
-          timeline_video_content_view.cc
           timing_panel.cc
           try_unmount_dialog.cc
           update_dialog.cc