summaryrefslogtreecommitdiff
path: root/src/wx/content_timeline.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-12-13 23:01:23 +0100
committerCarl Hetherington <cth@carlh.net>2024-03-12 00:43:51 +0100
commit1910147fd58ac58a21b8f3b874495179aa5424ab (patch)
tree0a5931c2facdac574f11c5b47314e2600597aba8 /src/wx/content_timeline.h
parentcc3a87b302581647330753a09815ca78c0a23fe4 (diff)
Rename TimelineView -> ContentTimelineView.
Diffstat (limited to 'src/wx/content_timeline.h')
-rw-r--r--src/wx/content_timeline.h6
1 files changed, 3 insertions, 3 deletions
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;