Upgrade libADLMIDI and libOPNMIDI
Added full-panning stereo, improvement of channel management, and many other things.
Also, I have implemented an ability to use custom WOPL (for libADLMIDI) and WOPN (for libOPNMIDI) banks from the same path as "soundfonts", but also, in the same environment, the "fm_banks" folder was added for WOPL/WOPN storing purposes.
To toggle usage of embedded or custom bank, I have added togglable booleans. When bank fails to be loaded, the default embedded bank is getting to be used as fallback.
ADLMIDI 1.4.0 2018-10-01
* Implemented a full support for Portamento! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added support for SysEx event handling! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added support for GS way of custom drum channels (through SysEx events)
* Ignore some NRPN events and lsb bank number when using GS standard (after catching of GS Reset SysEx call)
* Added support for CC66-Sostenuto controller (Pedal hold of currently-pressed notes only while CC64 holds also all next notes)
* Added support for CC67-SoftPedal controller (SoftPedal lowers the volume of notes played)
* Fixed correctness of CMF files playing
* Fixed unnecessary overuse of chip channels by blank notes
* Added API to disable specific MIDI tracks or play one of MIDI tracks solo
* Added support for more complex loop (loopStart=XX, loopEnd=0). Where XX - count of loops, or 0 - infinite. Nested loops are supported without of any limits.
* Added working implementation of TMB's velocity offset
* Added support for full-panning stereo option (Thanks to [Christopher Snowhill](https://github.com/kode54) for a work!)
* Fixed inability to play high notes due physical tone frequency out of range on the OPL3 chip
OPNMIDI 1.4.0 2018-10-01
* Implemented a full support for Portamento! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added support for SysEx event handling! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added support for GS way of custom drum channels (through SysEx events)
* Ignore some NRPN events and lsb bank number when using GS standard (after catching of GS Reset SysEx call)
* Added support for CC66-Sostenuto controller (Pedal hold of currently-pressed notes only while CC64 holds also all next notes)
* Added support for CC67-SoftPedal controller (SoftPedal lowers the volume of notes played)
* Resolved a trouble which sometimes makes a junk noise sound and unnecessary overuse of chip channels
* Volume models support taken from libADLMIDI has been adapted to OPN2's chip speficis
* Fixed inability to play high notes due physical tone frequency out of range on the OPN2 chip
* Added support for full-panning stereo option
ADL&OPN Hotfix: re-calculated default banks
The fix on side of measurer of OPL3-BE and OPN2-BE where some instruments getting zero releasing time.
# Conflicts:
# src/sound/mididevices/music_adlmidi_mididevice.cpp
# src/sound/mididevices/music_opnmidi_mididevice.cpp
# wadsrc/static/menudef.txt
2018-10-01 21:07:05 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2017-2018 Vitaly Novichkov (Wohlstand)
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
*/
|
|
|
|
|
Upgrade libADLMIDI and libOPNMIDI
Added ability to switch emulator and it's accuracy level ("enabling of 'run at PCM rate' reduces accuracy, and also reduces CPU usage")
Added draft code for future external banks support (WOPL format for ADLMIDI and WOPN format for OPNMIDI)
ADLMIDI 1.3.3 2018-06-19
* Fixed an inability to load another custom bank without of library re-initialization
* Optimizing the MIDI banks management system for MultiBanks (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Fixed incorrect 4-op counter which is still catch 4-op instruments on 2-op banks
* Fixed an incorrect processing of auto-flags
* Fixed incorrect initial MIDI tempo when MIDI file doesn't includes the tempo event
* Channel and Note Aftertouch features are now supported correctly! Aftertouch is the tremolo / vibrato, NOT A VOLUME!
* Updated DosBox OPL3 emulator up to r4111 of official DosBox trunk (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* The automatical choosing of 4 operator channels count has been improved (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added optional HQ resampler for Nuked OPL3 emulators which does usage of Zita-Resampler library (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
ADLMIDI 1.3.2 2018-04-24
* Added ability to disable MUS and XMI converters
* Added ability to disable embedded MIDI sequencer to use library as RealTime synthesizer only or use any custom MIDI sequencer plugins.
* Fixed blank instruments fallback in multi-bank support. When using non-zero bank, if instrument is blank, then, instrument will be taken from a root (I.e. zero bank).
* Added support for real-time switching the emulator
* Added support for CC-120 - "All sound off" on the MIDI channel
* Changed logic of CC-74 Brightness to affect sound only between 0 and 64 like real XG synthesizers. Ability to turn on a full-ranged brightness (to use full 0...127 range) is kept.
* Added support for different output sample formats (PCM8, PCM8U, PCM16, PCM16U, PCM32, PCM32U, Float32, and Float64) (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Reworked MIDI channels management to avoid any memory reallocations while music processing for a hard real time. (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
OPNMIDI 1.3.0 2018-06-19
* Optimizing the MIDI banks management system for MultiBanks (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Fixed incorrect initial MIDI tempo when MIDI file doesn't includes the tempo event
* Fixed an incorrect processing of auto-flags
* MAME YM2612 now results a more accurate sound as internal using of native sample rate makes more correct sound generation
* Channel and Note Aftertouch features are now supported correctly! Aftertouch is the tremolo / vibrato, NOT A VOLUME!
* Added optional HQ resampler for Nuked OPL3 emulators which does usage of Zita-Resampler library (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
OPNMIDI 1.2.0 2018-04-24
* Added ability to disable MUS and XMI converters
* Added ability to disable embedded MIDI sequencer to use library as RealTime synthesizer only or use any custom MIDI sequencer plugins.
* Fixed blank instruments fallback in multi-bank support. When using non-zero bank, if instrument is blank, then, instrument will be taken from a root (I.e. zero bank).
* Added support for real-time switching the emulator
* Added support for MAME YM2612 Emulator
* Added support for CC-120 - "All sound off" on the MIDI channel
* Changed logic of CC-74 Brightness to affect sound only between 0 and 64 like real XG synthesizers. Ability to turn on a full-ranged brightness (to use full 0...127 range) is kept.
* Added support for different output sample formats (PCM8, PCM8U, PCM16, PCM16U, PCM32, PCM32U, Float32, and Float64) (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Reworked MIDI channels management to avoid any memory reallocations while music processing for a hard real time. (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
(cherry picked from commit ceec12056a7868c71ce8a3a8922af2abd8fad556)
2018-06-19 21:48:42 +00:00
|
|
|
#ifndef ONP_CHIP_BASE_H
|
|
|
|
#define ONP_CHIP_BASE_H
|
|
|
|
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
|
|
|
|
#if !defined(_MSC_VER) && (__cplusplus <= 199711L)
|
|
|
|
#define final
|
|
|
|
#define override
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(ADLMIDI_ENABLE_HQ_RESAMPLER)
|
|
|
|
class VResampler;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(ADLMIDI_AUDIO_TICK_HANDLER)
|
|
|
|
extern void adl_audioTickHandler(void *instance, uint32_t chipId, uint32_t rate);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
class OPLChipBase
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
enum { nativeRate = 49716 };
|
|
|
|
protected:
|
|
|
|
uint32_t m_id;
|
|
|
|
uint32_t m_rate;
|
|
|
|
public:
|
|
|
|
OPLChipBase();
|
|
|
|
virtual ~OPLChipBase();
|
|
|
|
|
|
|
|
uint32_t chipId() const { return m_id; }
|
|
|
|
void setChipId(uint32_t id) { m_id = id; }
|
|
|
|
|
|
|
|
virtual bool canRunAtPcmRate() const = 0;
|
|
|
|
virtual bool isRunningAtPcmRate() const = 0;
|
|
|
|
virtual bool setRunningAtPcmRate(bool r) = 0;
|
|
|
|
#if defined(ADLMIDI_AUDIO_TICK_HANDLER)
|
|
|
|
virtual void setAudioTickHandlerInstance(void *instance) = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
virtual void setRate(uint32_t rate) = 0;
|
|
|
|
virtual uint32_t effectiveRate() const = 0;
|
|
|
|
virtual void reset() = 0;
|
|
|
|
virtual void writeReg(uint16_t addr, uint8_t data) = 0;
|
|
|
|
|
Upgrade libADLMIDI and libOPNMIDI
Added full-panning stereo, improvement of channel management, and many other things.
Also, I have implemented an ability to use custom WOPL (for libADLMIDI) and WOPN (for libOPNMIDI) banks from the same path as "soundfonts", but also, in the same environment, the "fm_banks" folder was added for WOPL/WOPN storing purposes.
To toggle usage of embedded or custom bank, I have added togglable booleans. When bank fails to be loaded, the default embedded bank is getting to be used as fallback.
ADLMIDI 1.4.0 2018-10-01
* Implemented a full support for Portamento! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added support for SysEx event handling! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added support for GS way of custom drum channels (through SysEx events)
* Ignore some NRPN events and lsb bank number when using GS standard (after catching of GS Reset SysEx call)
* Added support for CC66-Sostenuto controller (Pedal hold of currently-pressed notes only while CC64 holds also all next notes)
* Added support for CC67-SoftPedal controller (SoftPedal lowers the volume of notes played)
* Fixed correctness of CMF files playing
* Fixed unnecessary overuse of chip channels by blank notes
* Added API to disable specific MIDI tracks or play one of MIDI tracks solo
* Added support for more complex loop (loopStart=XX, loopEnd=0). Where XX - count of loops, or 0 - infinite. Nested loops are supported without of any limits.
* Added working implementation of TMB's velocity offset
* Added support for full-panning stereo option (Thanks to [Christopher Snowhill](https://github.com/kode54) for a work!)
* Fixed inability to play high notes due physical tone frequency out of range on the OPL3 chip
OPNMIDI 1.4.0 2018-10-01
* Implemented a full support for Portamento! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added support for SysEx event handling! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added support for GS way of custom drum channels (through SysEx events)
* Ignore some NRPN events and lsb bank number when using GS standard (after catching of GS Reset SysEx call)
* Added support for CC66-Sostenuto controller (Pedal hold of currently-pressed notes only while CC64 holds also all next notes)
* Added support for CC67-SoftPedal controller (SoftPedal lowers the volume of notes played)
* Resolved a trouble which sometimes makes a junk noise sound and unnecessary overuse of chip channels
* Volume models support taken from libADLMIDI has been adapted to OPN2's chip speficis
* Fixed inability to play high notes due physical tone frequency out of range on the OPN2 chip
* Added support for full-panning stereo option
ADL&OPN Hotfix: re-calculated default banks
The fix on side of measurer of OPL3-BE and OPN2-BE where some instruments getting zero releasing time.
# Conflicts:
# src/sound/mididevices/music_adlmidi_mididevice.cpp
# src/sound/mididevices/music_opnmidi_mididevice.cpp
# wadsrc/static/menudef.txt
2018-10-01 21:07:05 +00:00
|
|
|
// extended
|
|
|
|
virtual void writePan(uint16_t addr, uint8_t data) { (void)addr; (void)data; }
|
|
|
|
|
Upgrade libADLMIDI and libOPNMIDI
Added ability to switch emulator and it's accuracy level ("enabling of 'run at PCM rate' reduces accuracy, and also reduces CPU usage")
Added draft code for future external banks support (WOPL format for ADLMIDI and WOPN format for OPNMIDI)
ADLMIDI 1.3.3 2018-06-19
* Fixed an inability to load another custom bank without of library re-initialization
* Optimizing the MIDI banks management system for MultiBanks (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Fixed incorrect 4-op counter which is still catch 4-op instruments on 2-op banks
* Fixed an incorrect processing of auto-flags
* Fixed incorrect initial MIDI tempo when MIDI file doesn't includes the tempo event
* Channel and Note Aftertouch features are now supported correctly! Aftertouch is the tremolo / vibrato, NOT A VOLUME!
* Updated DosBox OPL3 emulator up to r4111 of official DosBox trunk (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* The automatical choosing of 4 operator channels count has been improved (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Added optional HQ resampler for Nuked OPL3 emulators which does usage of Zita-Resampler library (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
ADLMIDI 1.3.2 2018-04-24
* Added ability to disable MUS and XMI converters
* Added ability to disable embedded MIDI sequencer to use library as RealTime synthesizer only or use any custom MIDI sequencer plugins.
* Fixed blank instruments fallback in multi-bank support. When using non-zero bank, if instrument is blank, then, instrument will be taken from a root (I.e. zero bank).
* Added support for real-time switching the emulator
* Added support for CC-120 - "All sound off" on the MIDI channel
* Changed logic of CC-74 Brightness to affect sound only between 0 and 64 like real XG synthesizers. Ability to turn on a full-ranged brightness (to use full 0...127 range) is kept.
* Added support for different output sample formats (PCM8, PCM8U, PCM16, PCM16U, PCM32, PCM32U, Float32, and Float64) (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Reworked MIDI channels management to avoid any memory reallocations while music processing for a hard real time. (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
OPNMIDI 1.3.0 2018-06-19
* Optimizing the MIDI banks management system for MultiBanks (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Fixed incorrect initial MIDI tempo when MIDI file doesn't includes the tempo event
* Fixed an incorrect processing of auto-flags
* MAME YM2612 now results a more accurate sound as internal using of native sample rate makes more correct sound generation
* Channel and Note Aftertouch features are now supported correctly! Aftertouch is the tremolo / vibrato, NOT A VOLUME!
* Added optional HQ resampler for Nuked OPL3 emulators which does usage of Zita-Resampler library (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
OPNMIDI 1.2.0 2018-04-24
* Added ability to disable MUS and XMI converters
* Added ability to disable embedded MIDI sequencer to use library as RealTime synthesizer only or use any custom MIDI sequencer plugins.
* Fixed blank instruments fallback in multi-bank support. When using non-zero bank, if instrument is blank, then, instrument will be taken from a root (I.e. zero bank).
* Added support for real-time switching the emulator
* Added support for MAME YM2612 Emulator
* Added support for CC-120 - "All sound off" on the MIDI channel
* Changed logic of CC-74 Brightness to affect sound only between 0 and 64 like real XG synthesizers. Ability to turn on a full-ranged brightness (to use full 0...127 range) is kept.
* Added support for different output sample formats (PCM8, PCM8U, PCM16, PCM16U, PCM32, PCM32U, Float32, and Float64) (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
* Reworked MIDI channels management to avoid any memory reallocations while music processing for a hard real time. (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
(cherry picked from commit ceec12056a7868c71ce8a3a8922af2abd8fad556)
2018-06-19 21:48:42 +00:00
|
|
|
virtual void nativePreGenerate() = 0;
|
|
|
|
virtual void nativePostGenerate() = 0;
|
|
|
|
virtual void nativeGenerate(int16_t *frame) = 0;
|
|
|
|
|
|
|
|
virtual void generate(int16_t *output, size_t frames) = 0;
|
|
|
|
virtual void generateAndMix(int16_t *output, size_t frames) = 0;
|
|
|
|
virtual void generate32(int32_t *output, size_t frames) = 0;
|
|
|
|
virtual void generateAndMix32(int32_t *output, size_t frames) = 0;
|
|
|
|
|
|
|
|
virtual const char* emulatorName() = 0;
|
|
|
|
private:
|
|
|
|
OPLChipBase(const OPLChipBase &c);
|
|
|
|
OPLChipBase &operator=(const OPLChipBase &c);
|
|
|
|
};
|
|
|
|
|
|
|
|
// A base class providing F-bounded generic and efficient implementations,
|
|
|
|
// supporting resampling of chip outputs
|
|
|
|
template <class T>
|
|
|
|
class OPLChipBaseT : public OPLChipBase
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
OPLChipBaseT();
|
|
|
|
virtual ~OPLChipBaseT();
|
|
|
|
|
|
|
|
bool isRunningAtPcmRate() const override;
|
|
|
|
bool setRunningAtPcmRate(bool r) override;
|
|
|
|
#if defined(ADLMIDI_AUDIO_TICK_HANDLER)
|
|
|
|
void setAudioTickHandlerInstance(void *instance);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
virtual void setRate(uint32_t rate) override;
|
|
|
|
uint32_t effectiveRate() const override;
|
|
|
|
virtual void reset() override;
|
|
|
|
void generate(int16_t *output, size_t frames) override;
|
|
|
|
void generateAndMix(int16_t *output, size_t frames) override;
|
|
|
|
void generate32(int32_t *output, size_t frames) override;
|
|
|
|
void generateAndMix32(int32_t *output, size_t frames) override;
|
|
|
|
private:
|
|
|
|
bool m_runningAtPcmRate;
|
|
|
|
#if defined(ADLMIDI_AUDIO_TICK_HANDLER)
|
|
|
|
void *m_audioTickHandlerInstance;
|
|
|
|
#endif
|
|
|
|
void nativeTick(int16_t *frame);
|
|
|
|
void setupResampler(uint32_t rate);
|
|
|
|
void resetResampler();
|
|
|
|
void resampledGenerate(int32_t *output);
|
|
|
|
#if defined(ADLMIDI_ENABLE_HQ_RESAMPLER)
|
|
|
|
VResampler *m_resampler;
|
|
|
|
#else
|
|
|
|
int32_t m_oldsamples[2];
|
|
|
|
int32_t m_samples[2];
|
|
|
|
int32_t m_samplecnt;
|
|
|
|
int32_t m_rateratio;
|
|
|
|
enum { rsm_frac = 10 };
|
|
|
|
#endif
|
|
|
|
// amplitude scale factors in and out of resampler, varying for chips;
|
|
|
|
// values are OK to "redefine", the static polymorphism will accept it.
|
|
|
|
enum { resamplerPreAmplify = 1, resamplerPostAttenuate = 1 };
|
|
|
|
};
|
|
|
|
|
|
|
|
// A base class which provides frame-by-frame interfaces on emulations which
|
|
|
|
// don't have a routine for it. It produces outputs in fixed size buffers.
|
|
|
|
// Fast register updates will suffer some latency because of buffering.
|
|
|
|
template <class T, unsigned Buffer = 256>
|
|
|
|
class OPLChipBaseBufferedT : public OPLChipBaseT<T>
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
OPLChipBaseBufferedT()
|
|
|
|
: OPLChipBaseT<T>(), m_bufferIndex(0) {}
|
|
|
|
virtual ~OPLChipBaseBufferedT()
|
|
|
|
{}
|
|
|
|
public:
|
|
|
|
void reset() override;
|
|
|
|
void nativeGenerate(int16_t *frame) override;
|
|
|
|
protected:
|
|
|
|
virtual void nativeGenerateN(int16_t *output, size_t frames) = 0;
|
|
|
|
private:
|
|
|
|
unsigned m_bufferIndex;
|
|
|
|
int16_t m_buffer[2 * Buffer];
|
|
|
|
};
|
|
|
|
|
|
|
|
#include "opl_chip_base.tcc"
|
|
|
|
|
|
|
|
#endif // ONP_CHIP_BASE_H
|