Rename TimelineAtmosContentView -> ContentTimelineAtmosView.

diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc
index d5ed0f7bb3ecd37effd7bc19b2f90e8e749f6bfd..0f993108d1855cb8f6333792fa2718a2edcb2730 100644 (file)
--- a/src/wx/content_timeline.cc
+++ b/src/wx/content_timeline.cc
@@ -22,7 +22,7 @@
 #include "content_timeline.h"
 #include "film_editor.h"
 #include "film_viewer.h"
-#include "timeline_atmos_content_view.h"
+#include "content_timeline_atmos_view.h"
 #include "timeline_audio_content_view.h"
 #include "timeline_labels_view.h"
 #include "timeline_reels_view.h"
@@ -315,7 +315,7 @@ ContentTimeline::recreate_views()
                }
 
                if (i->atmos) {
-                       _views.push_back (make_shared<TimelineAtmosContentView>(*this, i));
+                       _views.push_back(make_shared<ContentTimelineAtmosView>(*this, i));
                }
        }
 
@@ -457,7 +457,7 @@ ContentTimeline::assign_tracks()
 
        bool have_atmos = false;
        for (auto i: _views) {
-               auto cv = dynamic_pointer_cast<TimelineAtmosContentView>(i);
+               auto cv = dynamic_pointer_cast<ContentTimelineAtmosView>(i);
                if (cv) {
                        cv->set_track (_tracks);
                        have_atmos = true;

diff --git a/src/wx/content_timeline_atmos_view.cc b/src/wx/content_timeline_atmos_view.cc
new file mode 100644 (file)
index 0000000..4b78a8a
--- /dev/null
+++ b/src/wx/content_timeline_atmos_view.cc
@@ -0,0 +1,50 @@
+/*
+    Copyright (C) 2016-2021 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/>.
+
+*/
+
+
+#include "content_timeline_atmos_view.h"
+
+
+using std::shared_ptr;
+
+
+/** @class ContentTimelineContentView
+ *  @brief Content timeline view for AtmosContent.
+ */
+
+ContentTimelineAtmosView::ContentTimelineAtmosView(ContentTimeline& tl, shared_ptr<Content> c)
+       : TimelineContentView (tl, c)
+{
+
+}
+
+
+wxColour
+ContentTimelineAtmosView::background_colour() const
+{
+       return wxColour (149, 121, 232, 255);
+}
+
+
+wxColour
+ContentTimelineAtmosView::foreground_colour() const
+{
+       return wxColour (0, 0, 0, 255);
+}

diff --git a/src/wx/content_timeline_atmos_view.h b/src/wx/content_timeline_atmos_view.h
new file mode 100644 (file)
index 0000000..d5fea92
--- /dev/null
+++ b/src/wx/content_timeline_atmos_view.h
@@ -0,0 +1,40 @@
+/*
+    Copyright (C) 2016-2021 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/>.
+
+*/
+
+
+#include "timeline_content_view.h"
+
+
+/** @class ContentTimelineAtmosContentView
+ *  @brief Content timeline view for AtmosContent.
+ */
+class ContentTimelineAtmosView : public TimelineContentView
+{
+public:
+       ContentTimelineAtmosView(ContentTimeline& tl, std::shared_ptr<Content> c);
+
+private:
+       bool active () const override {
+               return true;
+       }
+
+       wxColour background_colour () const override;
+       wxColour foreground_colour () const override;
+};

diff --git a/src/wx/timeline_atmos_content_view.cc b/src/wx/timeline_atmos_content_view.cc
deleted file mode 100644 (file)
index d40ede1..0000000
--- a/src/wx/timeline_atmos_content_view.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (C) 2016-2021 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/>.
-
-*/
-
-
-#include "timeline_atmos_content_view.h"
-
-
-using std::shared_ptr;
-
-
-/** @class TimelineAtmosContentView
- *  @brief Timeline view for AtmosContent.
- */
-
-TimelineAtmosContentView::TimelineAtmosContentView(ContentTimeline& tl, shared_ptr<Content> c)
-       : TimelineContentView (tl, c)
-{
-
-}
-
-
-wxColour
-TimelineAtmosContentView::background_colour () const
-{
-       return wxColour (149, 121, 232, 255);
-}
-
-
-wxColour
-TimelineAtmosContentView::foreground_colour () const
-{
-       return wxColour (0, 0, 0, 255);
-}

diff --git a/src/wx/timeline_atmos_content_view.h b/src/wx/timeline_atmos_content_view.h
deleted file mode 100644 (file)
index 9536837..0000000
--- a/src/wx/timeline_atmos_content_view.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-    Copyright (C) 2016-2021 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/>.
-
-*/
-
-
-#include "timeline_content_view.h"
-
-
-/** @class TimelineAtmosContentView
- *  @brief Timeline view for AtmosContent.
- */
-class TimelineAtmosContentView : public TimelineContentView
-{
-public:
-       TimelineAtmosContentView(ContentTimeline& tl, std::shared_ptr<Content> c);
-
-private:
-       bool active () const override {
-               return true;
-       }
-
-       wxColour background_colour () const override;
-       wxColour foreground_colour () const override;
-};

diff --git a/src/wx/wscript b/src/wx/wscript
index d6f1536e9b43080717e2221a3244a2fbcb45967d..f9573bd6d0d820c6e8eb5af0b9ef72f9a134f183 100644 (file)
--- 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_atmos_view.cc
           content_timeline_dialog.cc
           content_timeline_view.cc
           content_version_dialog.cc
@@ -164,7 +165,6 @@ sources = """
           timer_display.cc
           timecode.cc
           timeline.cc
-          timeline_atmos_content_view.cc
           timeline_content_view.cc
           timeline_audio_content_view.cc
           timeline_labels_view.cc