From 370d9dcda402a59ee27dfd06c12ff96ddd3c881e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 6 Jul 2025 23:21:03 +0200 Subject: Mention audio processor in the audio matrix. --- src/lib/film.cc | 12 ++++++++++++ src/lib/film.h | 1 + src/wx/audio_mapping_view.cc | 7 +++++++ src/wx/audio_mapping_view.h | 2 ++ src/wx/audio_panel.cc | 1 + 5 files changed, 23 insertions(+) diff --git a/src/lib/film.cc b/src/lib/film.cc index 46d985e58..4e16e47f2 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1901,6 +1901,18 @@ Film::audio_output_names() const return n; } + +string +Film::audio_output_name() const +{ + if (audio_processor()) { + return fmt::format(_("DCP (via {})"), audio_processor()->name()); + } + + return _("DCP"); +} + + void Film::repeat_content(ContentList c, int n) { diff --git a/src/lib/film.h b/src/lib/film.h index 1af21849e..273e9776b 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -164,6 +164,7 @@ public: } std::vector audio_output_names() const; + std::string audio_output_name() const; void repeat_content(ContentList, int); diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index f1f008846..ecf2fdd9b 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -591,3 +591,10 @@ AudioMappingView::left_width() const } +void +AudioMappingView::set_top_label(wxString top_label) +{ + _top_label = top_label; + Refresh(); +} + diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h index 7fb3c0463..f3e46532e 100644 --- a/src/wx/audio_mapping_view.h +++ b/src/wx/audio_mapping_view.h @@ -74,6 +74,8 @@ public: void set_input_groups (std::vector const & groups); + void set_top_label(wxString top_label); + boost::signals2::signal Changed; private: diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index 41e073dd1..f91d21da0 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -195,6 +195,7 @@ AudioPanel::film_changed (FilmProperty property) case FilmProperty::AUDIO_CHANNELS: case FilmProperty::AUDIO_PROCESSOR: _mapping->set_output_channels (_parent->film()->audio_output_names ()); + _mapping->set_top_label(std_to_wx(_parent->film()->audio_output_name())); setup_peak (); setup_sensitivity(); break; -- cgit v1.2.3