| Revision | c35d3a0ee2773bec9a00628644c23cc120d4ce1c (tree) |
|---|---|
| Zeit | 2020-10-10 03:51:16 |
| Autor | Starg <starg@user...> |
| Commiter | Starg |
[dls] Explicitly specify enumeration values in DLSConnectionBlock
timidity/dls.cpp (diff)| @@ -134,18 +134,22 @@ struct DLSConnectionBlock | ||
| 134 | 134 | { |
| 135 | 135 | enum class SourceKind : std::uint16_t |
| 136 | 136 | { |
| 137 | - None, | |
| 138 | - LFO, | |
| 139 | - KeyOnVelocity, | |
| 140 | - KeyNumber, | |
| 141 | - EG1, | |
| 142 | - EG2, | |
| 143 | - PitchWheel, | |
| 137 | + None = 0, | |
| 138 | + LFO = 1, | |
| 139 | + KeyOnVelocity = 2, | |
| 140 | + KeyNumber = 3, | |
| 141 | + EG1 = 4, | |
| 142 | + EG2 = 5, | |
| 143 | + PitchWheel = 6, | |
| 144 | 144 | |
| 145 | 145 | CC1 = 0x81, |
| 146 | 146 | CC7 = 0x87, |
| 147 | 147 | CC10 = 0x8A, |
| 148 | - CC11 = 0x8B | |
| 148 | + CC11 = 0x8B, | |
| 149 | + | |
| 150 | + RPN0 = 0x100, | |
| 151 | + RPN1 = 0x101, | |
| 152 | + RPN2 = 0x102 | |
| 149 | 153 | }; |
| 150 | 154 | |
| 151 | 155 | SourceKind Source; |
| @@ -153,31 +157,31 @@ struct DLSConnectionBlock | ||
| 153 | 157 | |
| 154 | 158 | enum class DestinationKind : std::uint16_t |
| 155 | 159 | { |
| 156 | - None, | |
| 157 | - Attenuation, | |
| 160 | + None = 0, | |
| 161 | + Attenuation = 1, | |
| 158 | 162 | Pitch = 3, |
| 159 | - Pan, | |
| 163 | + Pan = 4, | |
| 160 | 164 | |
| 161 | 165 | LFOFrequency = 0x104, |
| 162 | - LFOStartDelay, | |
| 166 | + LFOStartDelay = 0x105, | |
| 163 | 167 | |
| 164 | 168 | EG1AttackTime = 0x206, |
| 165 | - EG1DecayTime, | |
| 169 | + EG1DecayTime = 0x297, | |
| 166 | 170 | EG1ReleaseTime = 0x209, |
| 167 | - EG1SustainLevel, | |
| 171 | + EG1SustainLevel = 0x20A, | |
| 168 | 172 | |
| 169 | 173 | EG2AttackTime = 0x30A, |
| 170 | - EG2DecayTime, | |
| 174 | + EG2DecayTime = 0x30B, | |
| 171 | 175 | EG2ReleaseTime = 0x30D, |
| 172 | - EG2SustainLevel | |
| 176 | + EG2SustainLevel = 0x30E | |
| 173 | 177 | }; |
| 174 | 178 | |
| 175 | 179 | DestinationKind Destination; |
| 176 | 180 | |
| 177 | 181 | enum class TransformKind : std::uint16_t |
| 178 | 182 | { |
| 179 | - None, | |
| 180 | - Concave | |
| 183 | + None = 0, | |
| 184 | + Concave = 1 | |
| 181 | 185 | }; |
| 182 | 186 | |
| 183 | 187 | TransformKind Transform; |
Fork