diff options
| author | Wohlstand <admin@wohlnet.ru> | 2020-08-21 22:33:07 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2020-08-21 22:33:07 +0300 |
| commit | c025dc0c06eed05800d5081380b7771e2de6fea4 (patch) | |
| tree | 19f00334bc6d21ea218bc1fddc36fe6fbb674758 /src/adlmidi_opl3.hpp | |
| parent | 75637f387b2d91bf81ee2558244c030c3f7df26d (diff) | |
| parent | af8b30f7b83d4ee00f5255f84cc4305d609b446f (diff) | |
| download | libADLMIDI-c025dc0c06eed05800d5081380b7771e2de6fea4.tar.gz libADLMIDI-c025dc0c06eed05800d5081380b7771e2de6fea4.tar.bz2 libADLMIDI-c025dc0c06eed05800d5081380b7771e2de6fea4.zip | |
Merge branch 'master' into wip-new-embedded-banks
Diffstat (limited to 'src/adlmidi_opl3.hpp')
| -rw-r--r-- | src/adlmidi_opl3.hpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/adlmidi_opl3.hpp b/src/adlmidi_opl3.hpp index b97b5d3..a12069e 100644 --- a/src/adlmidi_opl3.hpp +++ b/src/adlmidi_opl3.hpp @@ -110,6 +110,8 @@ public: bool m_runAtPcmRate; //! Enable soft panning bool m_softPanning; + //! Master volume, controlled via SysEx (0...127) + uint8_t m_masterVolume; //! Just a padding. Reserved. char _padding2[3]; @@ -249,10 +251,14 @@ public: /** * @brief Change setup of instrument in specified chip channel * @param c Channel of chip (Emulated chip choosing by next formula: [c = ch + (chipId * 23)]) - * @param volume Volume level (from 0 to 63) + * @param volume Volume level (from 0 to 127) * @param brightness CC74 Brightness level (from 0 to 127) */ - void touchNote(size_t c, uint8_t volume, uint8_t brightness = 127); + void touchNote(size_t c, + uint_fast32_t velocity, + uint_fast32_t channelVolume = 127, + uint_fast32_t channelExpression = 127, + uint8_t brightness = 127); /** * @brief Set the instrument into specified chip channel |