Split out TimelineView from ContentTimelineView.

diff --git a/src/wx/content_timeline_view.cc b/src/wx/content_timeline_view.cc
index 05922d55818c5b0fc64493a5db735f3e86fc6510..127e440fac7bbfd6523e33c050f726d2abf39dbe 100644 (file)
--- a/src/wx/content_timeline_view.cc
+++ b/src/wx/content_timeline_view.cc
@@ -27,39 +27,12 @@ using std::list;
 using namespace dcpomatic;
 
 
-/** @class ContentContentTimelineView
- *  @brief Parent class for components of the content timeline (e.g. a piece of content or an axis).
- */
-ContentTimelineView::ContentTimelineView(ContentTimeline& t)
-       : _timeline (t)
+ContentTimelineView::ContentTimelineView(ContentTimeline& timeline)
+       : TimelineView(timeline)
 {
 
 }
 
-
-void
-ContentTimelineView::paint(wxGraphicsContext* g, list<dcpomatic::Rect<int>> overlaps)
-{
-       _last_paint_bbox = bbox ();
-       do_paint (g, overlaps);
-}
-
-
-void
-ContentTimelineView::force_redraw()
-{
-       _timeline.force_redraw (_last_paint_bbox.extended(4));
-       _timeline.force_redraw (bbox().extended(4));
-}
-
-
-int
-ContentTimelineView::time_x(DCPTime t) const
-{
-       return t.seconds() * _timeline.pixels_per_second().get_value_or(0);
-}
-
-
 int
 ContentTimelineView::y_pos(int t) const
 {

diff --git a/src/wx/content_timeline_view.h b/src/wx/content_timeline_view.h
index 0f6eeae518116cdd04b1e5ea6200df63770a950e..450d19df461dce16620d67598c49b7d629d24cff 100644 (file)
--- a/src/wx/content_timeline_view.h
+++ b/src/wx/content_timeline_view.h
@@ -23,6 +23,7 @@
 #define DCPOMATIC_CONTENT_TIMELINE_VIEW_H
 
 
+#include "timeline_view.h"
 #include "lib/rect.h"
 #include "lib/dcpomatic_time.h"
 
@@ -34,30 +35,22 @@ class ContentTimeline;
 /** @class ContentTimelineView
  *  @brief Parent class for components of the content timeline (e.g. a piece of content or an axis).
  */
-class ContentTimelineView
+class ContentTimelineView : public TimelineView<ContentTimeline>
 {
 public:
        explicit ContentTimelineView(ContentTimeline& t);
        virtual ~ContentTimelineView () = default;
 
-       ContentTimelineView(ContentTimelineView const&) = delete;
-       ContentTimelineView& operator=(ContentTimelineView const&) = delete;
-
-       void paint (wxGraphicsContext* g, std::list<dcpomatic::Rect<int>> overlaps);
-       void force_redraw ();
-
-       virtual dcpomatic::Rect<int> bbox () const = 0;
+       void paint(wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps)
+       {
+               _last_paint_bbox = bbox();
+               do_paint(gc, overlaps);
+       }
 
 protected:
-       virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int>> overlaps) = 0;
+       virtual void do_paint(wxGraphicsContext *, std::list<dcpomatic::Rect<int>> overlaps) = 0;
 
-       int time_x (dcpomatic::DCPTime t) const;
        int y_pos(int t) const;
-
-       ContentTimeline& _timeline;
-
-private:
-       dcpomatic::Rect<int> _last_paint_bbox;
 };
 
 

diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h
new file mode 100644 (file)
index 0000000..32eedde
--- /dev/null
+++ b/src/wx/timeline_view.h
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2023 Carl Hetherington <cth@carlh.net>
+
+    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.
+
+    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#ifndef DCPOMATIC_TIMELINE_VIEW_H
+#define DCPOMATIC_TIMELINE_VIEW_H
+
+
+#include "lib/rect.h"
+#include "lib/dcpomatic_time.h"
+
+
+class wxGraphicsContext;
+
+
+/** @class ContentTimelineView
+ *  @brief Parent class for components of the content timeline (e.g. a piece of content or an axis).
+ */
+template <class Timeline>
+class TimelineView
+{
+public:
+       explicit TimelineView(Timeline& timeline)
+               : _timeline(timeline)
+       {}
+
+       virtual ~TimelineView () = default;
+
+       TimelineView(TimelineView const&) = delete;
+       TimelineView& operator=(TimelineView const&) = delete;
+
+       void force_redraw()
+       {
+               _timeline.force_redraw(_last_paint_bbox.extended(4));
+               _timeline.force_redraw(bbox().extended(4));
+       }
+
+       virtual dcpomatic::Rect<int> bbox() const = 0;
+
+protected:
+       int time_x(dcpomatic::DCPTime t) const
+       {
+               return t.seconds() * _timeline.pixels_per_second().get_value_or(0);
+       }
+
+       Timeline& _timeline;
+       dcpomatic::Rect<int> _last_paint_bbox;
+};
+
+
+#endif
+