Remove the 4.0 Surround layout and make 4.0 the quad layout

This commit is contained in:
TheM14 committed 2026-10-29 00:52:17 +08:00
1 parent 7cd5c660e4
commit c8d2b09357
8 files changed
+71 -75

No files matched your search

+1 -15
View File
@@ -15,8 +15,7 @@ struct FrozenLayout {
constexpr FrozenLayout kLayouts[kLayoutCount] = {
{"2.0", 0, 1},
{"3.1", 3, 7},
{"4.0 Surround", 0xFF, 35},
{"4.0 Quad", 0xFF, 9},
{"4.0", 0xFF, 9},
{"5.1", 7, 15},
{"7.1", 11, 31},
{"5.1.2", 13, 1039},
@@ -27,14 +26,6 @@ constexpr FrozenLayout kLayouts[kLayoutCount] = {
{"9.1.6", 20, 3743},
};
// Spellings accepted in addition to the names above.
constexpr struct {
const char* alias;
const char* name;
} kAliases[] = {
{"4.0", "4.0 Surround"},
};
void fill(const FrozenLayout& source, LayoutInfo* out) {
out->name = source.name;
out->out_ch_config = source.out_ch_config;
@@ -62,11 +53,6 @@ bool layout_by_name(const char* name, LayoutInfo* out) {
return true;
}
}
for (const auto& alias : kAliases) {
if (std::strcmp(name, alias.alias) == 0) {
return layout_by_name(alias.name, out);
}
}
return false;
}