From 306c28facff88f38dd03831062dedd5a865578fe Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 15 Dec 2023 00:40:41 +0100 Subject: [PATCH] Rename TimelineAudioContentView -> ContentTimelineAudioView. --- src/wx/content_menu.cc | 6 +++--- src/wx/content_timeline.cc | 10 +++++----- ...tent_view.cc => content_timeline_audio_view.cc} | 14 +++++++------- ...ontent_view.h => content_timeline_audio_view.h} | 8 ++++---- src/wx/wscript | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) rename src/wx/{timeline_audio_content_view.cc => content_timeline_audio_view.cc} (84%) rename src/wx/{timeline_audio_content_view.h => content_timeline_audio_view.h} (82%) diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 4af5a71b7..9f89835ff 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -23,13 +23,13 @@ #include "content_advanced_dialog.h" #include "content_menu.h" #include "content_properties_dialog.h" +#include "content_timeline_audio_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 "timeline_audio_content_view.h" #include "wx_util.h" #include "lib/audio_content.h" #include "lib/config.h" @@ -315,11 +315,11 @@ ContentMenu::remove () } shared_ptr video; - shared_ptr audio; + shared_ptr audio; for (auto j: _views) { auto v = dynamic_pointer_cast(j); - auto a = dynamic_pointer_cast(j); + auto a = dynamic_pointer_cast(j); if (v && v->content() == fc) { video = v; } else if (a && a->content() == fc) { diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc index 0f993108d..3efb15d3f 100644 --- a/src/wx/content_timeline.cc +++ b/src/wx/content_timeline.cc @@ -23,7 +23,7 @@ #include "film_editor.h" #include "film_viewer.h" #include "content_timeline_atmos_view.h" -#include "timeline_audio_content_view.h" +#include "content_timeline_audio_view.h" #include "timeline_labels_view.h" #include "timeline_reels_view.h" #include "timeline_text_content_view.h" @@ -307,7 +307,7 @@ ContentTimeline::recreate_views() } if (i->audio && !i->audio->mapping().mapped_output_channels().empty ()) { - _views.push_back (make_shared(*this, i)); + _views.push_back(make_shared(*this, i)); } for (auto j: i->text) { @@ -406,13 +406,13 @@ place(shared_ptr film, ContentTimelineViewList& views, int& tracks) struct AudioMappingComparator { bool operator()(shared_ptr a, shared_ptr b) { int la = -1; - auto cva = dynamic_pointer_cast(a); + auto cva = dynamic_pointer_cast(a); if (cva) { auto oc = cva->content()->audio->mapping().mapped_output_channels(); la = *min_element(boost::begin(oc), boost::end(oc)); } int lb = -1; - auto cvb = dynamic_pointer_cast(b); + auto cvb = dynamic_pointer_cast(b); if (cvb) { auto oc = cvb->content()->audio->mapping().mapped_output_channels(); lb = *min_element(boost::begin(oc), boost::end(oc)); @@ -474,7 +474,7 @@ ContentTimeline::assign_tracks() auto views = _views; sort(views.begin(), views.end(), AudioMappingComparator()); - int const audio_tracks = place (film, views, _tracks); + int const audio_tracks = place(film, views, _tracks); _labels_view->set_video_tracks (video_tracks); _labels_view->set_audio_tracks (audio_tracks); diff --git a/src/wx/timeline_audio_content_view.cc b/src/wx/content_timeline_audio_view.cc similarity index 84% rename from src/wx/timeline_audio_content_view.cc rename to src/wx/content_timeline_audio_view.cc index 2920bf4fd..9604ee7cc 100644 --- a/src/wx/timeline_audio_content_view.cc +++ b/src/wx/content_timeline_audio_view.cc @@ -19,7 +19,7 @@ */ -#include "timeline_audio_content_view.h" +#include "content_timeline_audio_view.h" #include "wx_util.h" #include "lib/audio_content.h" #include "lib/util.h" @@ -30,31 +30,31 @@ using std::list; using std::shared_ptr; -/** @class TimelineAudioContentView - * @brief Timeline view for AudioContent. +/** @class ContentTimelineAudioView + * @brief Content timeline view for AudioContent. */ -TimelineAudioContentView::TimelineAudioContentView(ContentTimeline& tl, shared_ptr c) +ContentTimelineAudioView::ContentTimelineAudioView(ContentTimeline& tl, shared_ptr c) : TimelineContentView (tl, c) { } wxColour -TimelineAudioContentView::background_colour () const +ContentTimelineAudioView::background_colour () const { return wxColour (149, 121, 232, 255); } wxColour -TimelineAudioContentView::foreground_colour () const +ContentTimelineAudioView::foreground_colour () const { return wxColour (0, 0, 0, 255); } wxString -TimelineAudioContentView::label () const +ContentTimelineAudioView::label () const { wxString s = TimelineContentView::label (); shared_ptr ac = content()->audio; diff --git a/src/wx/timeline_audio_content_view.h b/src/wx/content_timeline_audio_view.h similarity index 82% rename from src/wx/timeline_audio_content_view.h rename to src/wx/content_timeline_audio_view.h index 29849adb2..719c2536d 100644 --- a/src/wx/timeline_audio_content_view.h +++ b/src/wx/content_timeline_audio_view.h @@ -22,13 +22,13 @@ #include "timeline_content_view.h" -/** @class TimelineAudioContentView - * @brief Timeline view for AudioContent. +/** @class ContentTimelineAudioView + * @brief Content timeline view for AudioContent. */ -class TimelineAudioContentView : public TimelineContentView +class ContentTimelineAudioView : public TimelineContentView { public: - TimelineAudioContentView(ContentTimeline& tl, std::shared_ptr c); + ContentTimelineAudioView(ContentTimeline& tl, std::shared_ptr c); private: bool active () const override { diff --git a/src/wx/wscript b/src/wx/wscript index f9573bd6d..c2bcd72c5 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -50,6 +50,7 @@ sources = """ content_sub_panel.cc content_timeline.cc content_timeline_atmos_view.cc + content_timeline_audio_view.cc content_timeline_dialog.cc content_timeline_view.cc content_version_dialog.cc @@ -166,7 +167,6 @@ sources = """ timecode.cc timeline.cc timeline_content_view.cc - timeline_audio_content_view.cc timeline_labels_view.cc timeline_text_content_view.cc timeline_reels_view.cc -- 2.30.2