summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-12-15 00:32:00 +0100
committerCarl Hetherington <cth@carlh.net>2024-03-12 00:43:51 +0100
commite5b053031e94a273ed889cd9e309d7d41c33a70d (patch)
treedae3a8fce4884955480bd1b05fa417928ea1be06
parent783680c0efae1934409e4c93796b5a6265198e17 (diff)
Rename TimelineAtmosContentView -> ContentTimelineAtmosView.
-rw-r--r--src/wx/content_timeline.cc6
-rw-r--r--src/wx/content_timeline_atmos_view.cc (renamed from src/wx/timeline_atmos_content_view.cc)12
-rw-r--r--src/wx/content_timeline_atmos_view.h (renamed from src/wx/timeline_atmos_content_view.h)8
-rw-r--r--src/wx/wscript2
4 files changed, 14 insertions, 14 deletions
diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc
index d5ed0f7bb..0f993108d 100644
--- 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/timeline_atmos_content_view.cc b/src/wx/content_timeline_atmos_view.cc
index d40ede137..4b78a8aee 100644
--- a/src/wx/timeline_atmos_content_view.cc
+++ b/src/wx/content_timeline_atmos_view.cc
@@ -19,17 +19,17 @@
*/
-#include "timeline_atmos_content_view.h"
+#include "content_timeline_atmos_view.h"
using std::shared_ptr;
-/** @class TimelineAtmosContentView
- * @brief Timeline view for AtmosContent.
+/** @class ContentTimelineContentView
+ * @brief Content timeline view for AtmosContent.
*/
-TimelineAtmosContentView::TimelineAtmosContentView(ContentTimeline& tl, shared_ptr<Content> c)
+ContentTimelineAtmosView::ContentTimelineAtmosView(ContentTimeline& tl, shared_ptr<Content> c)
: TimelineContentView (tl, c)
{
@@ -37,14 +37,14 @@ TimelineAtmosContentView::TimelineAtmosContentView(ContentTimeline& tl, shared_p
wxColour
-TimelineAtmosContentView::background_colour () const
+ContentTimelineAtmosView::background_colour() const
{
return wxColour (149, 121, 232, 255);
}
wxColour
-TimelineAtmosContentView::foreground_colour () const
+ContentTimelineAtmosView::foreground_colour() const
{
return wxColour (0, 0, 0, 255);
}
diff --git a/src/wx/timeline_atmos_content_view.h b/src/wx/content_timeline_atmos_view.h
index 9536837e0..d5fea9248 100644
--- a/src/wx/timeline_atmos_content_view.h
+++ b/src/wx/content_timeline_atmos_view.h
@@ -22,13 +22,13 @@
#include "timeline_content_view.h"
-/** @class TimelineAtmosContentView
- * @brief Timeline view for AtmosContent.
+/** @class ContentTimelineAtmosContentView
+ * @brief Content timeline view for AtmosContent.
*/
-class TimelineAtmosContentView : public TimelineContentView
+class ContentTimelineAtmosView : public TimelineContentView
{
public:
- TimelineAtmosContentView(ContentTimeline& tl, std::shared_ptr<Content> c);
+ ContentTimelineAtmosView(ContentTimeline& tl, std::shared_ptr<Content> c);
private:
bool active () const override {
diff --git a/src/wx/wscript b/src/wx/wscript
index d6f1536e9..f9573bd6d 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_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