From a839fa24b37f45e1a02ce6fdedc936f6c7647ae0 Mon Sep 17 00:00:00 2001 From: hogliux Date: Mon, 27 Feb 2017 11:52:41 +0000 Subject: [PATCH] Modified AudioChannelSet::getDescription() to return more commonly used names for surround formats (without the "+LFE" part) --- .../buffers/juce_AudioChannelSet.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp b/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp index 932c43cd29..d4581a2f55 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp +++ b/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp @@ -194,16 +194,16 @@ String AudioChannelSet::getDescription() const if (*this == createLRS()) return "LRS"; if (*this == createLCRS()) return "LCRS"; - if (*this == create5point0()) return "5.1 Surround"; - if (*this == create5point1()) return "5.1 Surround (+Lfe)"; - if (*this == create6point0()) return "6.1 Surround"; - if (*this == create6point1()) return "6.1 Surround (+Lfe)"; - if (*this == create6point0Music()) return "6.1 (Music) Surround"; - if (*this == create6point1Music()) return "6.1 (Music) Surround (+Lfe)"; - if (*this == create7point0()) return "7.1 Surround"; - if (*this == create7point1()) return "7.1 Surround (Lfe)"; - if (*this == create7point0SDDS()) return "7.1 Surround SDDS"; - if (*this == create7point1SDDS()) return "7.1 Surround SDDS (+Lfe)"; + if (*this == create5point0()) return "5.0 Surround"; + if (*this == create5point1()) return "5.1 Surround"; + if (*this == create6point0()) return "6.0 Surround"; + if (*this == create6point1()) return "6.1 Surround"; + if (*this == create6point0Music()) return "6.0 (Music) Surround"; + if (*this == create6point1Music()) return "6.1 (Music) Surround"; + if (*this == create7point0()) return "7.0 Surround"; + if (*this == create7point1()) return "7.1 Surround"; + if (*this == create7point0SDDS()) return "7.0 Surround SDDS"; + if (*this == create7point1SDDS()) return "7.1 Surround SDDS"; if (*this == quadraphonic()) return "Quadraphonic"; if (*this == pentagonal()) return "Pentagonal";