@@ -51,6 +51,7 @@ enum class ChannelLayout(@JsonValue val layoutName: String, val channels: List<C
51
51
CH_LAYOUT_5POINT1_SIDE (" 5.1(side)" , listOf (FL , FR , FC , LFE , SL , SR )),
52
52
CH_LAYOUT_6POINT0 (" 6.0" , listOf (FL , FR , FC , BC , SL , SR )),
53
53
CH_LAYOUT_6POINT0_FRONT (" 6.0(front)" , listOf (FL , FR , FLC , FRC , SL , SR )),
54
+ CH_LAYOUT_3POINT1POINT2 (" 3.1.2" , listOf (FL , FR , FC , LFE , TFL , TFR )),
54
55
CH_LAYOUT_HEXAGONAL (" hexagonal" , listOf (FL , FR , FC , BL , BR , BC )),
55
56
CH_LAYOUT_6POINT1 (" 6.1" , listOf (FL , FR , FC , LFE , BC , SL , SR )),
56
57
CH_LAYOUT_6POINT1_BACK (" 6.1(back)" , listOf (FL , FR , FC , LFE , BL , BR , BC )),
@@ -60,9 +61,16 @@ enum class ChannelLayout(@JsonValue val layoutName: String, val channels: List<C
60
61
CH_LAYOUT_7POINT1 (" 7.1" , listOf (FL , FR , FC , LFE , BL , BR , SL , SR )),
61
62
CH_LAYOUT_7POINT1_WIDE (" 7.1(wide)" , listOf (FL , FR , FC , LFE , BL , BR , FLC , FRC )),
62
63
CH_LAYOUT_7POINT1_WIDE_SIDE (" 7.1(wide-side)" , listOf (FL , FR , FC , LFE , FLC , FRC , SL , SR )),
63
- CH_LAYOUT_OCTAGONAL (" octagonal)" , listOf (FL , FR , FC , BL , BR , BC , SL , SR )),
64
+ CH_LAYOUT_5POINT1POINT2 (" 5.1.2" , listOf (FL , FR , FC , LFE , BL , BR , TFL , TFR )),
65
+ CH_LAYOUT_OCTAGONAL (" octagonal" , listOf (FL , FR , FC , BL , BR , BC , SL , SR )),
66
+ CH_LAYOUT_CUBE (" cube" , listOf (FL , FR , BL , BR , TFL , TFR , TBL , TBR )),
67
+ CH_LAYOUT_5POINT1POINT4 (" 5.1.4" , listOf (FL , FR , FC , LFE , BL , BR , TFL , TFR , TBL , TBR )),
68
+ CH_LAYOUT_7POINT1POINT2 (" 7.1.2" , listOf (FL , FR , FC , LFE , BL , BR , SL , SR , TFL , TFR )),
69
+ CH_LAYOUT_7POINT1POINT4 (" 7.1.4" , listOf (FL , FR , FC , LFE , BL , BR , SL , SR , TFL , TFR , TBL , TBR )),
70
+ CH_LAYOUT_7POINT2POINT3 (" 7.2.3" , listOf (FL , FR , FC , LFE , BL , BR , SL , SR , TFL , TFR , TBC , LFE2 )),
71
+ CH_LAYOUT_9POINT1POINT4 (" 9.1.4" , listOf (FL , FR , FC , LFE , BL , BR , FLC , FRC , SL , SR , TFL , TFR , TBL , TBR )),
64
72
CH_LAYOUT_HEXADECAGONAL (
65
- " hexadecagonal) " ,
73
+ " hexadecagonal" ,
66
74
listOf (
67
75
FL , FR , FC , BL , BR , BC , SL , SR , TFL , TFC , TFR , TBL , TBC , TBR , WL , WR
68
76
)
@@ -99,7 +107,7 @@ enum class ChannelLayout(@JsonValue val layoutName: String, val channels: List<C
99
107
);
100
108
101
109
companion object {
102
- fun defaultChannelLayout (numChannels : Int ) = values() .firstOrNull { it.channels.size == numChannels }
103
- fun getByNameOrNull (layoutName : String ) = values() .firstOrNull { it.layoutName == layoutName }
110
+ fun defaultChannelLayout (numChannels : Int ) = entries .firstOrNull { it.channels.size == numChannels }
111
+ fun getByNameOrNull (layoutName : String ) = entries .firstOrNull { it.layoutName == layoutName }
104
112
}
105
113
}
0 commit comments