From efa2efa221d77ad332e1926747f377005456595e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 7 Jun 2022 02:33:41 +0200 Subject: [PATCH] Fix "muted" indicator (dup on audio-regions, missing on macOS) RegionView::make_name already adds the prefix, AudioRegionView does not need to add it again. Also the font used on macOS (Lucia Grande) has a rather limited UTF-8 charset and does not support: \u20F0 (COMBINING ENCLOSING CIRCLE BACKSLASH) \U0001F507 (SPEAKER WITH CANCELLATION STROKE) so for now we keep using "!" on macOS. --- gtk2_ardour/audio_region_view.cc | 5 ----- gtk2_ardour/region_view.cc | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index a00c828b5f..31a47f8e07 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -391,11 +391,6 @@ AudioRegionView::region_renamed () str = string ("*") + str; } - if (_region->muted()) { - str = string ("!") + str; - } - - boost::shared_ptr ar (audio_region()); if (ar->scale_amplitude() != 1.0) { char tmp[32]; diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 2d7fe8b1eb..027441a402 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -799,7 +799,11 @@ RegionView::make_name () const } if (_region->muted()) { +#ifdef __APPLE__ + str = string ("!") + str; +#else str = std::string("\U0001F507") + str; // SPEAKER WITH CANCELLATION STROKE +#endif } return str;