etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-22 12:35:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into docs-faq

Browse source
This commit is contained in:
Electric Keet 2024-09-22 15:03:38 -07:00 committed by GitHub
commit 8f82a31445
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
90 changed files with 13764 additions and 2772 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -552,6 +552,7 @@ src/engine/platform/sound/nes/fds.c
src/engine/platform/sound/nes/mmc5.c
src/engine/platform/sound/vera_psg.c
src/engine/platform/sound/vera_pcm.c
src/engine/platform/sound/ymf278b/ymf278.cpp
src/engine/platform/sound/atomicssg/ssg.c
@ -669,6 +670,8 @@ src/engine/platform/sound/sid2/wave8580_P_T.cc
src/engine/platform/sound/sid2/wave8580__ST.cc
src/engine/platform/sound/sid2/wave.cc
src/engine/platform/sound/sid3.c
src/engine/platform/oplAInterface.cpp
src/engine/platform/ym2608Interface.cpp
src/engine/platform/ym2610Interface.cpp
@ -795,6 +798,7 @@ src/engine/platform/gbaminmod.cpp
src/engine/platform/nds.cpp
src/engine/platform/bifurcator.cpp
src/engine/platform/sid2.cpp
src/engine/platform/sid3.cpp
src/engine/platform/pcmdac.cpp
src/engine/platform/dummy.cpp

4
TODO.md
View file

@ -1,3 +1,7 @@
# to-do for 0.6.8
- OPL3 mute fix
# to-do long term
- CSM macros

BIN
demos/genesis/yky.fur
View file

Binary file not shown.

BIN
demos/opl/Time_Is_Lost_OPL4.fur Normal file
View file

Binary file not shown.

78
doc/3-pattern/effects.md
View file

@ -198,12 +198,12 @@ additionally, [each chip has its own effects](../7-systems/README.md).
the interpretation of duty, wave and extra macros depends on chip/instrument type:
ex | FM | OPM | OPZ | OPLL | AY-3-8910 | AY8930 | Lynx | C64 |
---|--------|-----------|-----------|-------|------------|------------|----------|------------|
---|--------|-----------|-----------|-------|------------|------------|----------|---------------|
D | NoiseF | NoiseFreq | | | NoiseFreq | NoiseFreq | Duty/Int | Duty |
W | | LFO Shape | LFO Shape | Patch | Waveform | Waveform | | Waveform |
1 | | AMD | AMD | | | Duty | | FilterMode |
2 | | PMD | PMD | | Envelope | Envelope | | Resonance |
3 | LFOSpd | LFO Speed | LFO Speed | | AutoEnvNum | AutoEnvNum | | |
3 | LFOSpd | LFO Speed | LFO Speed | | AutoEnvNum | AutoEnvNum | | Filter Toggle |
A | ALG | ALG | ALG | | AutoEnvDen | AutoEnvDen | | Cutoff |
B | FB | FB | FB | | | Noise AND | | |
C | FMS | FMS | FMS | | | Noise OR | | |
@ -231,19 +231,61 @@ ex | SAA1099 | X1-010 | Namco 163 | FDS | Sound Unit | ES5506 | M
7 | | | | | | EnvRampK2 | |
8 | | | | | | Env Mode | |
ex | QSound | SNES | MSM5232 |
---|--------------|-----------|-----------|
D | Echo Level | NoiseFreq | GroupCtrl |
W | | Waveform | |
1 | EchoFeedback | Special | GroupAtk |
2 | Echo Length | Gain | GroupDec |
3 | | | Noise |
A | | | |
B | | | |
C | | | |
D | | | |
4 | | | |
5 | | | |
6 | | | |
7 | | | |
8 | | | |
ex | QSound | SNES | MSM5232 | SID2 |
---|--------------|-----------|-----------|---------------|
D | Echo Level | NoiseFreq | GroupCtrl | Duty |
W | | Waveform | | Waveform |
1 | EchoFeedback | Special | GroupAtk | Filter mode |
2 | Echo Length | Gain | GroupDec | Resonance |
3 | | | Noise | Filter toggle |
A | | | | Filter cutoff |
B | | | | |
C | | | | Noise mode |
D | | | | Wave mix mode |
4 | | | | Special |
5 | | | | Attack |
6 | | | | Decay |
7 | | | | Sustain |
8 | | | | Release |
SID3 instrument also uses some of the FM operators macros in main macros list:
ex | SID3 |
------|-------------------------------|
D | Duty |
W | Waveform |
1 | Special |
2 | Attack |
3 | Decay |
A | Special wave |
B | Phase Mod source |
C | Ring Mod source |
D | Hard sync source |
4 | Sustain |
5 | Sustain rate |
6 | Release |
7 | LFSR feedback bits |
8 | Wave mix mode |
OP1 AM| Key On/Off |
OP2 AM| Noise phase reset |
OP3 AM| Envelope reset |
OP4 AM| Noise Arpeggio |
OP1 AR| Noise Pitch |
OP2 AR| 1-bit noise/PCM mode |
OP3 AR| Channel signal inversion |
OP4 AR| Feedback |
SID3 instrument uses FM operators macros for filters:
ex | SID3 |
-----|-------------------------------|
D2R | Cutoff |
DAM | Resonance |
DR | Filter toggle |
DT2 | Distortion level |
DT | Output volume |
DVB | Connect to channel input |
EGT | Connect to channel output |
KSL | Connection matrix row |
KSR | Filter mode |

1
doc/4-instrument/README.md
View file

@ -67,6 +67,7 @@ the following instrument types are available:
- [SegaPCM](segapcm.md) - for use with SegaPCM sample chip.
- [Seta/Allumer X1-010](x1_010.md) - for use with Wavetable portion in Seta/Allumer X1-010.
- [SID2](sid2.md) - for use with SID2 fantasy chip.
- [SID3](sid3.md) - for use with SID3 fantasy chip.
- [SM8521](sm8521.md) - for use with SM8521 chip, used in Tiger Game.com.
- [SN76489/Sega PSG](psg.md) - for use with TI SN76489 and derivatives like Sega Master System's PSG.
- [SNES](snes.md) - for use with SNES.

2
doc/4-instrument/c64.md
View file

@ -13,6 +13,8 @@ the C64 instrument editor consists of two tabs: "C64" to control various paramet
- **Sustain**: sets the volume level at which the sound stops decaying and holds steady (0 to 15).
- **Release**: determines the rate at which the sound fades out after note off. the higher the value, the longer the release (0 to 15).
- **Duty**: specifies the width of a pulse wave (0 to 4095).
- **Reset duty on new note**: overwrite current duty value with the one that is specified in the instrument on new note.
- only useful when using relative duty macro.
- **Ring Modulation**: when enabled, the channel's output will be multiplied with the previous channel's.
- **Oscillator Sync**: enables oscillator hard sync. as the previous channel's oscillator finishes a cycle, it resets the period of the channel's oscillator, forcing the latter to have the same base frequency. this can produce a harmonically rich sound, the timbre of which can be altered by varying the synchronized oscillator's frequency.

2
doc/4-instrument/sid2.md
View file

@ -14,6 +14,8 @@ the SID2 instrument editor consists of two tabs: "SID2" to control various param
- **Sustain**: sets the volume level at which the sound stops decaying and holds steady (0 to 15).
- **Release**: determines the rate at which the sound fades out after note off. the higher the value, the longer the release (0 to 15).
- **Duty**: specifies the width of a pulse wave (0 to 4095).
- **Reset duty on new note**: overwrite current duty value with the one that is specified in the instrument on new note.
- only useful when using relative duty macro.
- **Ring Modulation**: when enabled, the channel's output will be multiplied with the previous channel's.
- **Oscillator Sync**: enables oscillator hard sync. as the previous channel's oscillator finishes a cycle, it resets the period of the channel's oscillator, forcing the latter to have the same base frequency. this can produce a harmonically rich sound, the timbre of which can be altered by varying the synchronized oscillator's frequency.

142
doc/4-instrument/sid3.md Normal file
View file

@ -0,0 +1,142 @@
# SID3 instrument editor
the SID3 editor is divided into 8 tabs:
- **SID3**: for controlling the basic parameters of SID3 sound source.
- **Wavetable**: for controlling the wavetable synth.
- **Sample**: for various sample settings.
- **Macros (Filter 1)**: for macros controlling parameters of filter 1.
- **Macros (Filter 2)**: for macros controlling parameters of filter 2.
- **Macros (Filter 3)**: for macros controlling parameters of filter 3.
- **Macros (Filter 4)**: for macros controlling parameters of filter 4.
- **Macros**: for other macros.
## Wavetable
this allows you to enable and configure the Furnace wavetable synthesizer. see [this page](wavesynth.md) for more information.
## Sample
for sample settings, see [the Sample instrument editor](sample.md).
the only differences are the lack of an "Use wavetable" option, and the presence of a "Use sample" one.
## SID3
- **Waveform**: allows selecting a waveform.
- more than one waveform can be selected at once. in that case a logical AND mix of waves will occur...
- although with default mix mode it does occur a bit wrong (like on 8580 SID chip). see below what happens when other modes are in use.
- **Special wave**: allows selecting a special wave. the wave preview is to the right.
- **Wavetable channel**: replaces and hides some macros and UI elements, and makes instrument operate with last wavetable/sample channel:
- **Waveform** macro now selects a wavetable
- **Duty**, **Special Wave**, **Feedback**, **Noise Phase Reset**, **Noise LFSR bits** and **Wave Mix** macros are hidden
- **1-Bit Noise** macro now controls wavetable/PCM mode (it becomes **Sample Mode** macro)
- **Inv. left** and **Inv. right**: invert the signal of corresponding stereo channels.
- **Attack**: determines the rising time for the sound. the bigger the value, the slower the attack. (0 to 255).
- **Decay**: determines the diminishing time for the sound. the higher the value, the longer the decay (0 to 255).
- **Sustain**: sets the volume level at which the sound stops decaying and holds or also decays, but with different speed (0 to 255).
- **Sustain rate**: sets the speed at which the sound decays after reaching sustain volume level. (0 to 255).
- **Release**: determines the rate at which the sound fades out after note off. the higher the value, the longer the release (0 to 255).
- **Wave Mix Mode**: dictates how different waves on the same channel are mixed together.
- **Duty**: specifies the width of a pulse wave (0 to 65535).
- **Feedback**: specifies the feedback level (0 to 255).
- **Reset duty on new note**: overwrite current duty value with the one that is specified in the instrument on new note.
- only useful when using relative duty macro.
- **Absolute Duty Macro**: when enabled, the duty macro will go from 0 to 65535 (in other words, control the duty directly rather than being relative).
- **Ring Modulation**: when enabled, the channel's output will be multiplied with the source channel's.
- **Oscillator Sync**: enables oscillator hard sync. as the source channel's oscillator finishes a cycle, it resets the period of the channel's oscillator, forcing the latter to have the same base frequency. this can produce a harmonically rich sound, the timbre of which can be altered by varying the synchronized oscillator's frequency.
- **Phase Modulation**: when enabled, the channel's phase will be modified with the source channel's signal (signal is taken from filtered channel's output if filters are enabled).
- **Separate noise pitch**: when enabled, the noise frequency/pitch will be controllable via special macros: **Noise Arpeggio** and **Noise Pitch**.
Then follow controls for each of the 4 filters:
- **Enable filter**: when enabled, this instrument will go through the filter.
- **Initialize filter**: initializes the filter with the specified parameters:
- **Cutoff**: the filter's point in where frequencies are cut off (0 to 65535).
- **Resonance**: amplifies or focuses on the cutoff frequency, creating a secondary peak forms and colors the original pitch (0 to 255).
- **Filter mode**: sets the filter mode. you may pick one or more of the following:
- **low**: a low-pass filter. the lower the cutoff, the darker the sound.
- **high**: a high-pass filter. higher cutoff values result in a less "bassy" sound.
- **band**: a band-pass filter. cutoff determines which part of the sound is heard (from bass to treble).
- multiple filter modes can be selected simultaneously. for example, selecting both "low" and "high" results in a bandstop (notch) filter.
- **Output volume**: sets the filter output volume (0 to 255).
- **Distortion level**: dictates how hard the signal is distorted (soft clipping). distortion is slightly asymmetrical (0 to 255).
- **Absolute Cutoff Macro**: when enabled, the cutoff macro will go from 0 to 65535, and it will be absolute.
- **Change cutoff with pitch**: when enabled, the cutoff will be scaled according to the frequency offset from specified note.
- **Decrease cutoff when pitch increases**: if this is enabled, filter cutoff will decrease if you increase the pitch. if this is disabled, filter cutoff will increase if you increase the pitch.
- **Cutoff change center note**: this note marks the center frequency at which no cutoff scaling is happening. the further you go from it in each direction, the more the cutoff scaling will be.
- **Cutoff change strength**: how much cutoff will be scaled.
- **Change resonance with pitch**: when enabled, the resonance will be scaled according to the frequency offset from specified note.
- **Decrease resonance when pitch increases**: if this is enabled, filter resonance will decrease if you increase the pitch. if this is disabled, filter resonance will increase if you increase the pitch.
- **Resonance change center note**: this note marks the center frequency at which no resonance scaling is happening. the further you go from it in each direction, the more the resonance scaling will be.
- **Resonance change strength**: how much resonance will be scaled.
- **Filters connection matrix**: controls routing of the filters' signals.
- **In**: this column connects the filters to ADSR sound output.
- next 4 columns make up the inter-filters connection matrix.
- **Out**: this column connects the filters' output to final channel output.
### special noise LFSR configurations
this table contains a list of LFSR configurations that are automatically detected and brought to tune by Furnace. a short description is given. number needs to be pasted into **Noise LFSR bits** macro. it is recommended to place a single bar in **Noise Phase Reset** macro for the consistency of the wave.
| LFSR config | Description |
|--------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------:|
| 524288 | wave very close to [SID2](sid2.md) noise mode 1 wave. tonal, without very harsh overtones. |
| 541065280 | wave resembling vocals, has two main tones at least 2 octaves apart |
| 2068 | wave very close to SID2 noise mode 3 wave. tonal but with harsh timbre. |
| 66 | wave very close to SID2 noise mode 2 wave. timbre is somewhere in-between SID2's noise mode 1 and noise mode 3 waves. |
if you find more interesting waves, please contact LTVA or tildearrow, so they can be added to Furnace frequency correction routine and to this table.
## Filter `x` macros
- **Cutoff**: filter `x` cutoff sequence.
- **Resonance**: filter `x` resonance sequence.
- **Filter toggle**: turns filter `x` on and off.
- **Filter mode**: select filter `x` mode.
- **Distortion level**: filter `x` distortion level sequence.
- **Output Volume**: filter `x` output volume sequence.
- **Channel Input Connection**: connect filter `x` to channel ADSR output.
- **Channel Output Connection**: connect filter `x` output to final channel output.
- **Connection Matrix Row**: connect other filters' outputs to filter `x` input.
## Macros
- **Volume**: volume sequence.
- **Arpeggio**: pitch sequence.
- **Pitch**: fine pitch.
- **Duty**: pulse width sequence.
- **Waveform**: select the waveform used by instrument.
- in wavetable channel mode controls the wavetable index.
- **Special Wave**: select the special wave used by instrument.
- **Noise Arpeggio**: noise pitch sequence.
- this macro is visible only if **Separate noise pitch** option is enabled. otherwise noise pitch is controlled by **Arpeggio** and **Pitch** macros.
- **Noise Pitch**: fine pitch.
- this macro is visible only if **Separate noise pitch** option is enabled.
- **Panning (left)**: output level for left channel.
- **Panning (right)**: output level for right channel.
- **Channel Inversion**: invert signal of left and right channels.
- **Key On/Off**: envelope release/start again control.
- **Special**: ring, oscillator sync and phase modulation selector.
- **Ring Mod Source**: ring modulation source channel.
- **Hard Sync Source**: oscillator sync source channel.
- **Phase Mod Source**: phase modulation source channel.
- **Feedback**: feedback sequence
- **Phase Reset**: trigger restart of waveform.
- **Noise Phase Reset**: trigger restart of noise accumulator and LFSR.
- **Envelope Reset**: trigger restart of envelope (unlike key on/off, envelope is forced to restart from 0 volume level no matter which volume it is outputting now).
- **Attack**: sets envelope attack speed.
- if you modify attack speed when the envelope is in attack phase it immediately changes.
- **Decay**: sets envelope decay speed.
- if you modify decay speed when envelope is in decay phase it immediately changes.
- **Sustain**: sets envelope sustain level.
- if you modify sustain level when envelope is in sustain phase it immediately changes.
- **Sustain Rate**: sets envelope sustain rate.
- if you modify sustain rate when envelope is in sustain phase it immediately changes.
- **Release**: sets envelope release speed.
- if you modify release speed when envelope is in release phase it immediately changes.
- **Noise LFSR bits**: sets feedback bits of noise LFSR.
- **1-Bit Noise**: controls noise mode.
- in wavetable channel mode it's called **Sample Mode**, and macro controls wave/PCM mode of the last channel.
- **Wave Mix**: select the waveform mix mode.

1
doc/7-systems/README.md
View file

@ -102,6 +102,7 @@ this is the full list of chips that Furnace supports.
- [SAA1099](saa1099.md)
- [SegaPCM](segapcm.md)
- [SID2](sid2.md)
- [SID3](sid3.md)
- [SM8521](sm8521.md)
- [SN76489/Sega PSG](sms.md)
- [SNES](snes.md)

8
doc/7-systems/c64.md
View file

@ -62,6 +62,14 @@ two versions of aforementioned chip exist - 6581 (original chip) and 8580 (impro
- `21xy`: **set sustain/release.**
- `x` is the sustain.
- `y` is the release.
- `22xx`: **pulse width slide up.**
- `xx` is speed. if it is `00`, the slide is stopped.
- `23xx`: **pulse width slide down.**
- `xx` is speed. if it is `00`, the slide is stopped.
- `24xx`: **filter cutoff slide up.**
- `xx` is speed. if it is `00`, the slide is stopped.
- `25xx`: **filter cutoff slide down.**
- `xx` is speed. if it is `00`, the slide is stopped.
- `3xxx`: **set duty cycle.** `xxx` range is `000` to `FFF`.
- `4xxx`: **set cutoff.** `xxx` range is `000` to `7FF`.

12
doc/7-systems/sid2.md
View file

@ -1,10 +1,10 @@
# SID2
a fictional chip created by LTVA. the idea is to fix SID flaws and add more features, but not too much.
a fictional chip created by LTVA. the idea is to fix [SID](c64.md) flaws and add more features, but not too much.
unlike SID, it has per-channel volume control, better ADSR envelope which doesn't have bugs, more waveform mixing modes and the ability to play tonal noise waves.
filter cutoff and resonance ranges were extended, as well as the frequency - finally the chip can hit B-7 note with default clock speed!
each channel now has its own independent filter. filter cutoff and resonance ranges were extended, as well as the frequency - finally the chip can hit B-7 note with default clock speed!
## effects
@ -46,6 +46,14 @@ filter cutoff and resonance ranges were extended, as well as the frequency - fin
- `9`: phase reset (`y` is a discarded parameter and does not matter)
- `A`: envelope key on/key off (`y` is `0` (trigger envelope release) or `1` (restart envelope again))
- `B`: filter on/off (`y` is `0` (disable filter) or `1` (enable filter))
- `17xx`: **pulse width slide up.**
- `xx` is speed. if it is `00`, the slide is stopped.
- `18xx`: **pulse width slide down.**
- `xx` is speed. if it is `00`, the slide is stopped.
- `19xx`: **filter cutoff slide up.**
- `xx` is speed. if it is `00`, the slide is stopped.
- `1Axx`: **filter cutoff slide down.**
- `xx` is speed. if it is `00`, the slide is stopped.
- `3xxx`: **set duty cycle.** `xxx` range is `000` to `FFF`.
- `4xxx`: **set cutoff.** `xxx` range is `000` to `FFF`.

123
doc/7-systems/sid3.md Normal file
View file

@ -0,0 +1,123 @@
# SID3
a fictional chip created by LTVA. the idea is to stay vaguely in [SID](c64.md)-like category of chips, but add a lot of features and more channels.
chip has 6 synth channels and one channel capable of playing wavetable or streamed samples.
each of synth channels has the following:
- two phase accumulator based oscillators, one for tone and one for noise LFSR clocking; frequency range is from 0.001Hz to around 15kHz at default clock speed.
- 5 waveform types which can be enabled in any combination: pulse (with 16-bit pulse width control), triangle, sawtooth, noise and so called special wave.
- there are 58 different special waves, including all [OPL3](opl.md) and [OPZ](opz.md) waveforms, their clipped versions, cubed sawtooth and triangle variations, and more...
- noise is generated from 30-bit LFSR. like in C64, eight of the bits are used to form 8-bit noise signal. user can adjust feedback freely, any bit can be feedback bit. some feedback bits configurations produce very short looped noise which is perceived as tone. see SID3 instrument description for notable feedback bits configurations which are automatically detected by Furnace: upon detection noise frequency is adjusted in such a way that fundamental frequency of such tonal noise becomes the note frequency the channel is currently playing (noise stays in tune).
- 1-bit noise mode is available for [AY](ay8910.md) fans. it this mode the highest LFSR bit is read as output. by rapidly switching between usual and 1-bit noise modes one can produce interesting rattling-like percussive sound.
- 5 waveform mixing modes: 8580 SID (C64's combined waves; mode does bitwise AND with noise and special wave), bitwise AND, bitwise OR, bitwise XOR and sum of oscillators' signals.
- hard sync between channels. each channel can have any other channel as sync source, even itself.
- ring modulation between channels. each channel can have any other channel as modulation source, even itself. when you self-modulate, you effectively square the signal, but the behavior is a bit different.
- phase modulation between channels. each channel can have any other channel as modulation source, even itself. when you self-modulate, you have an effect similar to enabling strong feedback. channel output after filters is used as modulation source.
- ADSR envelope with sustain rate setting (how fast sound decays when envelope is in sustain phase).
- 4 independent filters. each filter has its own cutoff, resonance, output volume, mode, on/off and distortion setting. each filter can be connected to channel's ADSR output. each filter's output can be routed to the final channel output. each filter output can be connected to each filter's input (full connection matrix).
- distortion is a simple asymmetrical distortion with hyperbolic tangent function for positive half of the wave and exponential function for negative half.
- several filters can be chained for flexible subtractive synth or to increase filter's slope (which is 12 dB/octave for a single filter).
- multiple filter modes can be selected simultaneously. for example, selecting both "low" and "high" results in a bandstop (notch) filter.
- adjustable feedback. feedback saves two previous channel's outputs and adds them to accumulator on the next step before computing waveform signal.
- fine control over left and right channel panning.
- left and right channels' signals can be inverted to create simple "surround" sound.
ADSR can be reset to the start of attack phase. phase of tone and noise oscillators can also be reset, and with noise oscillator reset noise LFSR is also reset to initial state.
wave channel has all these features, except, obviously, waveform generation stage, as well as feedback and noise generator.
## effects
- `1xxx`: **set filter 1 cutoff.** `xxx` range is `000` to `FFF`.
- `2xxx`: **set filter 2 cutoff.** `xxx` range is `000` to `FFF`.
- `3xxx`: **set filter 3 cutoff.** `xxx` range is `000` to `FFF`.
- `4xxx`: **set filter 4 cutoff.** `xxx` range is `000` to `FFF`.
- `5xxx`: **set duty cycle.** `xxx` range is `000` to `FFF`.
- `60xx`: **change wave.** lower 5 bits specify the wave:
- `bit 0`: triangle
- `bit 1`: saw
- `bit 2`: pulse
- `bit 3`: noise
- `bit 4`: special wave
- `61xx`: **change special wave.** `xx` range is `00` to `39`.
- `62xx`: **modulation control.** lower 3 bits control the modulation:
- `bit 0`: ring modulation
- `bit 1`: oscillator sync
- `bit 2`: phase modulation
- `63xy`: **reset duty cycle**:
- if `x` is not 0: on new note
- if `y` is not 0: now
- `64xx`: **set ring modulation source channel.** `xx` range is `00` to `07` where `07` means self-modulation and lower values specify a source channel.
- `65xx`: **set hard sync source channel.** `xx` is `00` to `06`.
- `66xx`: **set phase modulation source channel.** `xx` is `00` to `06`.
- `67xx`: **set attack.** `xx` range is `00` to `FF`.
- `68xx`: **set decay.** `xx` range is `00` to `FF`.
- `69xx`: **set sustain level.** `xx` range is `00` to `FF`.
- `6Axx`: **set sustain rate.** `xx` range is `00` to `FF`.
- `6Bxx`: **set release.** `xx` range is `00` to `FF`.
- `6Cxx`: **set waveform mix mode.** `xx` range is `00` to `04`.
- `6Dxx`: **set noise LFSR feedback bits (lower byte).** `xx` range is `00` to `FF`.
- `6Exx`: **set noise LFSR feedback bits (medium byte).** `xx` range is `00` to `FF`.
- `6Fxx`: **set noise LFSR feedback bits (higher byte).** `xx` range is `00` to `FF`.
- `70xx`: **set noise LFSR feedback bits (highest bits).** `xx` range is `00` to `3F`.
- `71xx`: **set filter 1 resonance.** `xx` range is `00` to `FF`.
- `72xx`: **set filter 2 resonance.** `xx` range is `00` to `FF`.
- `73xx`: **set filter 3 resonance.** `xx` range is `00` to `FF`.
- `74xx`: **set filter 4 resonance.** `xx` range is `00` to `FF`.
- `75xx`: **set noise/wave channel mode.** `xx` range is `00` to `01`. on synth channels `00` sets usual noise mode and `01` sets 1-bit noise mode. on wave channel `00` sets wavetable mode and `01` sets streamed PCM sample playback mode.
- `76xx`: **set filter 1 output volume.** `xx` range is `00` to `FF`.
- `77xx`: **set filter 2 output volume.** `xx` range is `00` to `FF`.
- `78xx`: **set filter 3 output volume.** `xx` range is `00` to `FF`.
- `79xx`: **set filter 4 output volume.** `xx` range is `00` to `FF`.
- `7Axx`: **set filter 1 distortion.** `xx` range is `00` to `FF`.
- `7Bxx`: **set filter 2 distortion.** `xx` range is `00` to `FF`.
- `7Cxx`: **set filter 3 distortion.** `xx` range is `00` to `FF`.
- `7Dxx`: **set filter 4 distortion.** `xx` range is `00` to `FF`.
- `7Exx`: **set feedback.** `xx` range is `00` to `FF`.
- `7Fxx`: **channel inversion control.** lower 2 bits control the channel signal inversion:
- `bit 0`: invert right channel
- `bit 1`: invert left channel
- `A0xy`: **set filter mode.** `x` is the filter (`0-3`), and lower 3 bits of `y` control the mode:
- `bit 0`: low pass
- `bit 1`: band pass
- `bit 2`: high pass
- `A1xy`: **set filter connection.** `x` is the filter (`0-3`), and lower 2 bits of `y` control the connection:
- `bit 0`: connect filter input to channel's ADSR output
- `bit 1`: connect filter's output to final channel output
- `A2xy`: **set filter connection matrix row.** `x` is the filter (`0-3`), and lower 4 bits of `y` control the inter-filter connections:
- `bit 0`: connect filter input to filter 1 output
- `bit 1`: connect filter input to filter 2 output
- `bit 2`: connect filter input to filter 3 output
- `bit 3`: connect filter input to filter 4 output
- `A3xy`: **enable filter.** `x` is the filter (`0-3`), `y` is either `0` (filter disabled) or `1` (filter enabled).
- `A4xx`: **pulse width slide up.** `xx` is speed. `A400` stops the slide.
- `A5xx`: **pulse width slide down.** `xx` is speed. `A500` stops the slide.
- `A6xx`: **filter 1 cutoff slide up.** `xx` is speed. `A600` stops the slide.
- `A7xx`: **filter 1 cutoff slide down.** `xx` is speed. `A700` stops the slide.
- `A8xx`: **filter 2 cutoff slide up.** `xx` is speed. `A800` stops the slide.
- `A9xx`: **filter 2 cutoff slide down.** `xx` is speed. `A900` stops the slide.
- `AAxx`: **filter 3 cutoff slide up.** `xx` is speed. `AA00` stops the slide.
- `ABxx`: **filter 3 cutoff slide down.** `xx` is speed. `AB00` stops the slide.
- `ACxx`: **filter 4 cutoff slide up.** `xx` is speed. `AC00` stops the slide.
- `ADxx`: **filter 4 cutoff slide down.** `xx` is speed. `AD00` stops the slide.
- `AExx`: **tone phase reset.** `xx` is the tick on which the phase reset happens.
- `AFxx`: **noise phase reset.** `xx` is the tick on which the phase reset happens.
- `B0xx`: **envelope reset.** `xx` is the tick on which the envelope reset happens.
- `B1xy`: **filter cutoff scaling control.** `x` is the filter (`0-3`), and lower 2 bits of `y` control the scaling:
- `bit 0`: enable cutoff scaling
- `bit 1`: inverse cutoff scaling
- `B2xy`: **filter resonance scaling control.** `x` is the filter (`0-3`), and lower 2 bits of `y` control the scaling:
- `bit 0`: enable resonance scaling
- `bit 1`: inverse resonance scaling
## info
this chip uses the [SID3](../4-instrument/sid3.md) instrument editor.
## chip config
the following options are available in the Chip Manager window:
- **Quarter clock speed**: make chip run on quarter the default clock rate (1MHz is default). this lowers CPU load almost 4 times at the cost of filters becoming unstable or having different timbre at high cutoff and resonance settings. option affects the chip only in playback mode. when you render module into audio file, option is not applied.

18
doc/9-guides/emulation-cores.md
View file

@ -3,13 +3,13 @@
Furnace achieves the authentic sound of videogame hardware by emulating sound chips as accurately as possible, using **emulator cores**. in some cases there are multiple cores to choose from, each with different strengths and weaknesses. here are the major differences between them all.
- **YM2151 core**:
- **ymfm**: default playback core. much less CPU usage than Nuked-OPM, but less accurate. recommended for users with last-gen or earlier hardware.
- **ymfm**: default playback core. much less CPU usage than Nuked-OPM, but less accurate. recommended for users with mobile, last-gen or earlier hardware.
- **Nuked-OPM**: default render core. much more accurate than ymfm, due to the emulator being based on an image of the die map taken from a real YM2151. very CPU heavy, only recommended for users with recent hardware.
- **YM2612 core**:
- **Nuked-OPN2**: default core. a little lighter on the CPU than Nuked-OPM.
- **Nuked-OPN2**: default core. lighter on the CPU than Nuked-OPM, can be used to simulate any variant of YM2612.
- **ymfm**: same as ymfm above.
- **YMF276-LLE**: a new core written by the author of the Nuked cores, specifically focused on YMF276 emulation. it is very slow and not useful for real-time playback.
- **YMF276-LLE**: a new core written by the author of the Nuked cores, specifically focused on YMF276 emulation. it is very slow and not useful for real-time playback. Produces audio comparable to output of Sega Mega Drive model 2 and later Fujitsu FM Towns computers, doesn't emulate DAC distortion of the original YM2612.
- **SN76489 core**:
- **MAME**: default core. less accurate than Nuked, but with lower CPU usage. comes from the MAME emulator project.
@ -25,7 +25,7 @@ Furnace achieves the authentic sound of videogame hardware by emulating sound ch
- **SID core**:
- **reSID**: default playback core. a high quality emulation core. somewhat CPU heavy.
- **reSIDfp**: default render core. improved version of reSID. the most accurate choice. _extremely_ CPU heavy.
- **reSIDfp**: default render core. improved version of reSID. the most accurate choice. _very_ CPU heavy.
- **dSID**: a lightweight open-source core used in DefleMask. not so accurate but it's very CPU light.
- **POKEY core**:
@ -35,20 +35,24 @@ Furnace achieves the authentic sound of videogame hardware by emulating sound ch
- **OPN/OPNA/OPNB cores**:
- **ymfm only**: lower CPU usage, less accurate FM.
- **Nuked-OPN2 (FM) + ymfm (SSG/ADPCM)**: default cores. more accurate FM at the cost of more CPU load.
- **YM2608-LLE**: a new core written by the author of the Nuked cores. high accuracy, but extremely high CPU usage.
- **YM2608-LLE**: a new core written by the author of the Nuked cores. high accuracy, but _extremely_ high CPU usage, far beyond any other emulation core. (over 500% CPU time on 10th gen Intel Core i5!)
- **OPL/OPL2/Y8950 core**:
- **Nuked-OPL3**: high quality OPL emulation core. slightly off due to tiny differences between OPL and OPL3, but otherwise it is good.
- **ymfm**: this core is supposed to use less CPU than Nuked-OPL3, but for some reason it actually doesn't.
- **YM3812-LLE**: a new core written by the author of the Nuked cores. it features extremely accurate emulation.
- **YM3812-LLE**: a new core written by the author of the Nuked cores. it features _extremely_ accurate emulation.
- this core uses a *lot* of CPU time. may not be suitable for playback!
- **OPL3 core**:
- **Nuked-OPL3**: high quality OPL emulation core.
- **ymfm**: this core is supposed to use less CPU than Nuked-OPL3, but for some reason it actually doesn't.
- **YMF262-LLE**: a new core written by the author of the Nuked cores. it features extremely accurate emulation.
- **YMF262-LLE**: a new core written by the author of the Nuked cores. it features _extremely_ accurate emulation.
- this core uses even more CPU than YM3812-LLE. not suitable for playback or even rendering if you're impatient!
- **OPL4 core**:
- **Nuked-OPL3 (FM) + openMSX (PCM)**: high quality OPL4 emulation core.
- **ymfm**: this core is supposed to use less CPU than Nuked-OPL3, but for some reason it actually doesn't.
- **ESFM core**:
- **ESFMu**: the ESFM emulator. best choice but CPU intensive.
- **ESFMu (fast)**: this is a modification of ESFMu to reduce CPU usage at the cost of less accuracy.

13
papers/format.md
View file

@ -191,7 +191,7 @@ size | description
| - 0x9c: Virtual Boy - 6 channels
| - 0x9d: VRC7 - 6 channels
| - 0x9e: YM2610B - 16 channels
| - 0x9f: ZX Spectrum (beeper, tildearrow engine) - 6 channels
| - 0x9f: ZX Spectrum (beeper, SFX-like tildearrow engine) - 6 channels
| - 0xa0: YM2612 extended - 9 channels
| - 0xa1: Konami SCC - 5 channels
| - 0xa2: OPL drums (YM3526) - 11 channels
@ -206,8 +206,8 @@ size | description
| - 0xab: MSM6258 - 1 channel
| - 0xac: Commander X16 (VERA) - 17 channels
| - 0xad: Bubble System WSG - 2 channels
| - 0xae: OPL4 (YMF278B) - 42 channels (UNAVAILABLE)
| - 0xaf: OPL4 drums (YMF278B) - 44 channels (UNAVAILABLE)
| - 0xae: OPL4 (YMF278B) - 42 channels
| - 0xaf: OPL4 drums (YMF278B) - 44 channels
| - 0xb0: Seta/Allumer X1-010 - 16 channels
| - 0xb1: Ensoniq ES5506 - 32 channels
| - 0xb2: Yamaha Y8950 - 10 channels
@ -258,8 +258,8 @@ size | description
| - 0xe0: QSound - 19 channels
| - 0xe1: PS1 - 24 channels (UNAVAILABLE)
| - 0xe2: C64 (6581) with PCM - 4 channels (UNAVAILABLE)
| - 0xe3: Watara Supervision - 4 channels (UNAVAILABLE)
| - 0xe4: µPD1771C - 1 channel (UNAVAILABLE)
| - 0xe3: Watara Supervision - 4 channels
| - 0xe4: µPD1771C - 1 channel
| - 0xf0: SID2 - 3 channels
| - 0xf1: 5E01 - 5 channels
| - 0xf5: SID3 - 7 channels
@ -391,7 +391,7 @@ size | description
1 | reset arp effect phase on new note (>=184)
1 | linear volume scaling rounds up (>=188)
1 | legacy "always set volume" behavior (>=191)
1 | reserved
1 | legacy sample offset effect (>=200)
--- | **speed pattern of first song** (>=139)
1 | length of speed pattern (fail if this is lower than 0 or higher than 16)
16 | speed pattern (this overrides speed 1 and speed 2 settings)
@ -590,6 +590,7 @@ size | description
| - 11: 8-bit μ-law PCM
| - 12: C219 PCM
| - 13: IMA ADPCM
| - 14: 12-bit PCM (MultiPCM)
| - 16: 16-bit PCM
1 | loop direction (>=123) or reserved
| - 0: forward

85
papers/newIns.md
View file

@ -158,9 +158,10 @@ the following feature codes are recognized:
- `EF`: ESFM ins data
- `PN`: PowerNoise ins data
- `S2`: SID2 ins data
- `S3`: SID3 ins data
- `EN`: end of features
- if you find this feature code, stop reading the instrument.
- it will usually appear only when there sample/wave lists.
- it will usually appear only when there are sample/wave lists.
- instruments in a .fur shall end with this feature code.
# instrument name (NA)
@ -335,6 +336,8 @@ size | description
| - bit 12-15: resonance
| - bit 0-10: cutoff (0-11 on SID2)
1 | upper nibble of resonance (for SID2) (>=199)
| - bits 0-3 hold this upper nibble
| - bit 4: reset duty on new note (>=222)
```
## C64 compatibility note (>=187)
@ -582,6 +585,11 @@ size | description
1 | LFO rate
1 | vibrato depth
1 | AM depth
1 | flags (>=221)
| - bit 0: damp
| - bit 1: pseudo-reverb
| - bit 2: LFO reset
| - bit 3: level direct
```
# Sound Unit data (SU)
@ -686,3 +694,78 @@ size | description
| - bit 4-5: wave mix mode
| - bit 0-3: volume
```
# SID3 data (S3)
```
size | description
-----|------------------------------------
1 | flags 1
| - bit 7: dutyIsAbs
| - bit 3: noise on
| - bit 2: pulse on
| - bit 1: saw on
| - bit 0: triangle on
1 | attack
1 | decay
1 | sustain
1 | sustain rate
1 | release
1 | wave mix mode
2 | duty
1 | flags 2
| - bit 7: phase modulation
| - bit 6: enable special wave
| - bit 5: 1-bit noise
| - bit 4: separate noise pitch
| - bit 3: do wavetable
| - bit 2: reset duty on new note
| - bit 1: osc sync
| - bit 0: ring mod
1 | phase modulation source channel
1 | ring modulation source channel
1 | hard sync source channel
1 | special wave
1 | flags 3
| - bit 1: left channel signal inversion
| - bit 0: right channel signal inversion
1 | feedback
1 | number of filters
```
then, `number of filters` times, come settings for each filter:
```
size | description
-----|------------------------------------
1 | parameters
| - bit 7: enable filter
| - bit 6: initialize filter
| - bit 5: absolute cutoff macro
| - bit 4: enable cutoff scaling
| - bit 3: decrease cutoff when pitch increases (for cutoff scaling)
| - bit 2: scale cutoff only once, on new note
| - bit 1: enable resonance scaling
| - bit 0: decrease resonance when pitch increases (for resonance scaling)
1 | parameters
| - bit 7: scale resonance only once, on new note
2 | filter cutoff
1 | filter resonance
1 | filter output volume
1 | filter distortion level
1 | filter mode:
| - bit 5: connect filter output to channel master output
| - bit 4: connect filter input to channel ADSR output
| - bit 2: band pass
| - bit 1: high pass
| - bit 0: low pass
1 | matrix connection:
| - bit 3: connect output of filter 4 to input
| - bit 2: connect output of filter 3 to input
| - bit 1: connect output of filter 2 to input
| - bit 0: connect output of filter 1 to input
1 | cutoff scaling level
1 | cutoff scaling center note: `0` is `c_5`, `1` is `c+5`, ..., `179` is `B-9`
1 | resonance scaling level
1 | resonance scaling center note: `0` is `c_5`, `1` is `c+5`, ..., `179` is `B-9`
```

240
res/icons.sfd
View file

@ -21,7 +21,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 0
CreationTime: 1691897631
ModificationTime: 1714372595
ModificationTime: 1726291788
PfmFamily: 81
TTFWeight: 400
TTFWidth: 5
@ -53,7 +53,7 @@ FitToEm: 0
WinInfo: 57540 21 12
BeginPrivate: 0
EndPrivate
BeginChars: 65536 104
BeginChars: 65536 107
StartChar: space
Encoding: 32 32 0
@ -7381,7 +7381,7 @@ EndChar
StartChar: uniE161
Encoding: 57697 57697 103
Width: 1792
Flags: HWO
Flags: HW
LayerCount: 2
Fore
SplineSet
@ -7483,5 +7483,239 @@ SplineSet
1289.22949219 805.58984375 1332.14550781 805.58984375 1375.0625 805.58984375 c 1
EndSplineSet
EndChar
StartChar: uniE162
Encoding: 57698 57698 104
Width: 1792
Flags: HW
LayerCount: 2
Fore
SplineSet
509.96484375 84.8447265625 m 0
439.5546875 84.8447265625 379.7890625 97.6376953125 330.5703125 123.223632812 c 128
281.3515625 148.809570312 239.1640625 183.184570312 204.0078125 226.446289062 c 1
235.192382812 255.645507812 266.377929688 284.844726562 297.5625 314.043945312 c 1
327.15234375 278.008789062 359.76953125 250.762695312 395.31640625 232.403320312 c 128
430.9609375 214.043945312 471.5859375 204.766601562 517.19140625 204.766601562 c 0
570.8046875 204.766601562 611.13671875 216.778320312 638.3828125 240.801757812 c 128
665.53125 264.825195312 679.203125 297.247070312 679.203125 337.969726562 c 0
679.203125 370.782226562 669.53515625 396.758789062 650.39453125 415.997070312 c 128
631.15625 435.235351562 597.171875 449.590820312 548.34375 459.161132812 c 1
523.5390625 463.587890625 498.734375 468.014648438 473.9296875 472.442382812 c 1
392.38671875 487.579101562 331.15625 514.434570312 290.3359375 552.813476562 c 128
249.515625 591.192382812 229.203125 644.024414062 229.203125 711.211914062 c 0
229.203125 748.028320312 236.13671875 781.426757812 250.19921875 811.407226562 c 128
264.1640625 841.387695312 283.79296875 866.583007812 308.98828125 886.993164062 c 128
334.18359375 907.403320312 364.75 923.223632812 400.78515625 934.356445312 c 128
436.72265625 945.586914062 477.15234375 951.153320312 521.9765625 951.153320312 c 0
585.16015625 951.153320312 639.9453125 940.215820312 686.33203125 918.243164062 c 128
732.71875 896.172851562 772.3671875 864.434570312 805.1796875 822.833007812 c 1
773.571289062 794.837890625 741.963867188 766.842773438 710.35546875 738.848632812 c 1
688.7734375 766.778320312 662.40625 789.239257812 631.15625 806.036132812 c 128
600.00390625 822.833007812 561.13671875 831.231445312 514.75 831.231445312 c 0
466.80078125 831.231445312 429.59375 821.563476562 403.12890625 802.422851562 c 128
376.76171875 783.184570312 363.578125 755.157226562 363.578125 718.438476562 c 0
363.578125 683.184570312 374.3203125 657.012695312 396 639.825195312 c 128
417.58203125 622.637695312 451.17578125 609.551757812 496.78125 600.762695312 c 1
521.5859375 595.586914062 546.390625 590.411132812 571.1953125 585.235351562 c 1
655.1796875 569.219726562 716.60546875 541.973632812 755.375 503.594726562 c 128
794.14453125 465.215820312 813.578125 412.383789062 813.578125 345.196289062 c 0
813.578125 306.036132812 806.7421875 270.391601562 793.16796875 238.360351562 c 128
779.59375 206.426757812 759.76953125 178.985351562 733.79296875 156.231445312 c 128
707.71875 133.379882812 675.98046875 115.801757812 638.3828125 103.399414062 c 128
600.78515625 90.9970703125 557.9140625 84.8447265625 509.96484375 84.8447265625 c 0
1152.34765625 99.2001953125 m 1
1060.74609375 378.399414062 969.14453125 657.598632812 877.54296875 936.797851562 c 1
924.352539062 936.797851562 971.163085938 936.797851562 1017.97265625 936.797851562 c 1
1062.37402344 798.809570312 1106.77441406 660.821289062 1151.17578125 522.833007812 c 1
1177.96582031 425.631835938 1204.75683594 328.431640625 1231.546875 231.231445312 c 1
1233.14160156 231.231445312 1234.73730469 231.231445312 1236.33203125 231.231445312 c 1
1263.54589844 328.431640625 1290.75878906 425.631835938 1317.97265625 522.833007812 c 1
1362.37402344 660.821289062 1406.77441406 798.809570312 1451.17578125 936.797851562 c 1
1496.78125 936.797851562 1542.38671875 936.797851562 1587.9921875 936.797851562 c 1
1495.18652344 657.598632812 1402.37988281 378.399414062 1309.57421875 99.2001953125 c 1
1257.16503906 99.2001953125 1204.75683594 99.2001953125 1152.34765625 99.2001953125 c 1
EndSplineSet
EndChar
StartChar: uniE163
Encoding: 57699 57699 105
Width: 1792
Flags: HW
LayerCount: 2
Fore
SplineSet
232.71875 -140.838867188 m 1
232.71875 147.181640625 232.71875 435.202148438 232.71875 723.223632812 c 1
276.338867188 723.223632812 319.958007812 723.223632812 363.578125 723.223632812 c 1
363.578125 596.400390625 363.578125 469.577148438 363.578125 342.754882812 c 1
363.578125 245.977539062 403.6171875 197.637695312 483.6953125 197.637695312 c 0
500.4921875 197.637695312 516.8984375 199.786132812 532.71875 204.180664062 c 128
548.734375 208.575195312 562.9921875 215.215820312 575.4921875 224.004882812 c 128
587.796875 232.793945312 597.7578125 244.024414062 605.375 257.598632812 c 128
612.9921875 271.172851562 616.8984375 287.188476562 616.8984375 305.645507812 c 1
616.8984375 444.837890625 616.8984375 584.030273438 616.8984375 723.223632812 c 1
660.453125 723.223632812 704.0078125 723.223632812 747.5625 723.223632812 c 1
747.5625 515.215820312 747.5625 307.208007812 747.5625 99.2001953125 c 1
704.0078125 99.2001953125 660.453125 99.2001953125 616.8984375 99.2001953125 c 1
616.8984375 133.607421875 616.8984375 168.014648438 616.8984375 202.422851562 c 1
615.270507812 202.422851562 613.643554688 202.422851562 612.015625 202.422851562 c 1
606.3515625 187.188476562 599.125 172.442382812 590.3359375 157.989257812 c 128
581.546875 143.633789062 570.8046875 131.036132812 558.109375 120.196289062 c 128
545.21875 109.356445312 530.1796875 100.762695312 512.9921875 94.4150390625 c 128
495.8046875 87.9697265625 476.46875 84.8447265625 454.7890625 84.8447265625 c 0
402.8359375 84.8447265625 367.6796875 103.985351562 349.125 142.364257812 c 1
347.5625 142.364257812 346 142.364257812 344.4375 142.364257812 c 1
350.817382812 99.5908203125 357.198242188 56.8173828125 363.578125 14.0439453125 c 1
363.578125 -37.583984375 363.578125 -89.2119140625 363.578125 -140.838867188 c 1
319.958007812 -140.838867188 276.338867188 -140.838867188 232.71875 -140.838867188 c 1
1256.7421875 84.8447265625 m 0
1147.171875 84.8447265625 1061.234375 121.758789062 998.734375 195.782226562 c 128
936.4296875 269.805664062 905.1796875 377.227539062 905.1796875 518.047851562 c 0
905.1796875 588.360351562 913.1875 650.372070312 929.203125 703.985351562 c 128
945.21875 757.598632812 968.4609375 802.813476562 998.734375 839.629882812 c 128
1029.203125 876.446289062 1066.1171875 904.180664062 1109.8671875 923.028320312 c 128
1153.421875 941.778320312 1202.4453125 951.153320312 1256.7421875 951.153320312 c 0
1329.59375 951.153320312 1390.53125 935.235351562 1439.75 903.204101562 c 128
1488.96875 871.172851562 1527.640625 824.004882812 1555.5703125 761.602539062 c 1
1517.61425781 740.801757812 1479.65917969 720.000976562 1441.703125 699.200195312 c 1
1427.25 739.239257812 1404.984375 770.977539062 1375.1015625 794.610351562 c 128
1345.0234375 818.243164062 1305.5703125 829.961914062 1256.7421875 829.961914062 c 0
1192.09375 829.961914062 1141.1171875 807.989257812 1104.3984375 764.043945312 c 128
1067.6796875 720.000976562 1049.125 659.161132812 1049.125 581.622070312 c 1
1049.125 539.206054688 1049.125 496.791015625 1049.125 454.375976562 c 1
1049.125 376.836914062 1067.6796875 315.997070312 1104.3984375 271.954101562 c 128
1141.1171875 228.008789062 1192.09375 206.036132812 1256.7421875 206.036132812 c 0
1307.1328125 206.036132812 1348.1484375 219.024414062 1379.7890625 245.000976562 c 128
1411.4296875 270.977539062 1434.8671875 304.375976562 1450.1015625 345.196289062 c 1
1486.49511719 323.190429688 1522.88769531 301.185546875 1559.28125 279.180664062 c 1
1531.15625 218.438476562 1492.09375 170.782226562 1441.703125 136.407226562 c 128
1391.1171875 102.032226562 1329.59375 84.8447265625 1256.7421875 84.8447265625 c 0
EndSplineSet
EndChar
StartChar: uniE164
Encoding: 57700 57700 106
Width: 1792
Flags: HW
LayerCount: 2
Fore
SplineSet
876.9375 252.015625 m 1
918.578125 252.015625 949.28125 260.84375 969.125 278.421875 c 128
988.96875 296.078125 998.890625 318.578125 998.890625 346.15625 c 1
998.890625 348.395507812 998.890625 350.635742188 998.890625 352.875 c 1
998.890625 383.578125 989.28125 407.09375 970.0625 423.421875 c 128
950.921875 439.75 924.984375 447.875 892.328125 447.875 c 0
860.296875 447.875 833.109375 440.6875 810.765625 426.3125 c 128
788.34375 411.859375 769.4375 391.859375 754.125 366.3125 c 1
730.114257812 387.09375 706.104492188 407.875 682.09375 428.65625 c 1
692.328125 443.421875 703.890625 457.484375 716.625 470.921875 c 128
729.4375 484.359375 744.515625 496.078125 761.78125 506 c 128
779.046875 515.921875 798.578125 523.890625 820.296875 529.984375 c 128
842.09375 536.078125 867.015625 539.046875 895.21875 539.046875 c 0
926.546875 539.046875 955.6875 535.21875 982.5625 527.5625 c 128
1009.4375 519.90625 1032.484375 508.5 1051.703125 493.5 c 128
1070.921875 478.421875 1085.921875 460.21875 1096.78125 438.734375 c 128
1107.71875 417.328125 1113.109375 393.1875 1113.109375 366.3125 c 0
1113.109375 345.140625 1109.75 326 1103.03125 308.65625 c 128
1096.3125 291.390625 1087.015625 276.234375 1075.21875 263.109375 c 128
1063.34375 249.984375 1049.59375 239.28125 1033.96875 230.921875 c 128
1018.265625 222.640625 1001.78125 216.546875 984.515625 212.71875 c 1
984.515625 211.104492188 984.515625 209.489257812 984.515625 207.875 c 1
1003.65625 204.046875 1021.78125 197.796875 1038.734375 189.203125 c 128
1055.6875 180.53125 1070.609375 169.359375 1083.34375 155.53125 c 128
1096.15625 141.78125 1106.234375 125.453125 1113.578125 106.625 c 128
1121 87.71875 1124.671875 66.15625 1124.671875 41.78125 c 0
1124.671875 12.328125 1118.890625 -14.390625 1107.40625 -38.375 c 128
1095.84375 -62.359375 1079.671875 -82.984375 1058.890625 -100.25 c 128
1038.109375 -117.59375 1012.953125 -130.796875 983.5 -140.09375 c 128
954.125 -149.390625 921.46875 -154 885.609375 -154 c 0
854.28125 -154 826.703125 -150.640625 803.03125 -143.921875 c 128
779.359375 -137.203125 758.421875 -128.296875 740.140625 -117.046875 c 128
721.9375 -105.875 705.921875 -93.0625 692.171875 -78.6875 c 128
678.421875 -64.3125 666.390625 -49.390625 656.15625 -34 c 1
682.71875 -13.21875 709.28125 7.5625 735.84375 28.34375 c 1
744.203125 14.90625 752.953125 2.640625 762.25 -8.609375 c 128
771.546875 -19.78125 782.09375 -29.390625 793.96875 -37.359375 c 128
805.765625 -45.40625 819.203125 -51.65625 834.28125 -56.109375 c 128
849.28125 -60.5625 866.390625 -62.828125 885.609375 -62.828125 c 0
926.546875 -62.828125 957.953125 -53.0625 979.671875 -33.53125 c 128
1001.46875 -14 1012.328125 13.03125 1012.328125 47.5625 c 1
1012.328125 49.8017578125 1012.328125 52.0419921875 1012.328125 54.28125 c 1
1012.328125 88.8125 1000.84375 115.0625 977.796875 133.03125 c 128
954.75 150.921875 922.09375 159.90625 879.828125 159.90625 c 1
856.15625 159.90625 832.484375 159.90625 808.8125 159.90625 c 1
808.8125 190.609375 808.8125 221.3125 808.8125 252.015625 c 1
831.520507812 252.015625 854.229492188 252.015625 876.9375 252.015625 c 1
378.5 712.015625 m 0
322.25 712.015625 274.4375 722.25 235.0625 742.71875 c 128
195.6875 763.1875 161.9375 790.6875 133.8125 825.296875 c 1
158.760742188 848.65625 183.708007812 872.015625 208.65625 895.375 c 1
232.25 866.546875 258.34375 844.75 286.78125 830.0625 c 128
315.375 815.375 347.875 807.953125 384.28125 807.953125 c 0
427.25 807.953125 459.4375 817.5625 481.3125 836.78125 c 128
503.03125 856 513.96875 881.9375 513.96875 914.515625 c 0
513.96875 940.765625 506.15625 961.546875 490.84375 976.9375 c 128
475.53125 992.328125 448.34375 1003.8125 409.28125 1011.46875 c 1
389.4375 1015.01074219 369.59375 1018.55175781 349.75 1022.09375 c 1
284.4375 1034.203125 235.53125 1055.6875 202.875 1086.390625 c 128
170.21875 1117.09375 153.96875 1159.359375 153.96875 1213.109375 c 0
153.96875 1242.5625 159.4375 1269.28125 170.6875 1293.265625 c 128
181.9375 1317.25 197.5625 1337.40625 217.71875 1353.734375 c 128
237.875 1370.0625 262.40625 1382.71875 291.15625 1391.625 c 128
319.90625 1400.609375 352.25 1405.0625 388.1875 1405.0625 c 0
438.65625 1405.0625 482.5625 1396.3125 519.59375 1378.734375 c 128
556.78125 1361.078125 588.5 1335.6875 614.75 1302.40625 c 1
589.4375 1280.01074219 564.125 1257.61425781 538.8125 1235.21875 c 1
521.625 1257.5625 500.53125 1275.53125 475.53125 1288.96875 c 128
450.53125 1302.40625 419.4375 1309.125 382.40625 1309.125 c 0
343.96875 1309.125 314.28125 1301.390625 293.03125 1286.078125 c 128
271.9375 1270.6875 261.46875 1248.265625 261.46875 1218.890625 c 0
261.46875 1190.6875 270.0625 1169.75 287.40625 1156 c 128
304.59375 1142.25 331.46875 1131.78125 368.03125 1124.75 c 1
387.875 1120.609375 407.71875 1116.46875 427.5625 1112.328125 c 1
494.75 1099.515625 543.8125 1077.71875 574.90625 1047.015625 c 128
605.84375 1016.3125 621.46875 974.046875 621.46875 920.296875 c 0
621.46875 888.96875 616 860.453125 605.0625 834.828125 c 128
594.28125 809.28125 578.34375 787.328125 557.5625 769.125 c 128
536.78125 750.84375 511.3125 736.78125 481.3125 726.859375 c 128
451.15625 716.9375 416.9375 712.015625 378.5 712.015625 c 0
709.125 723.5 m 1
709.125 752.926757812 709.125 782.354492188 709.125 811.78125 c 1
739.489257812 811.78125 769.854492188 811.78125 800.21875 811.78125 c 1
800.21875 976.286132812 800.21875 1140.79199219 800.21875 1305.296875 c 1
769.854492188 1305.296875 739.489257812 1305.296875 709.125 1305.296875 c 1
709.125 1334.72363281 709.125 1364.15136719 709.125 1393.578125 c 1
806.416992188 1393.578125 903.708007812 1393.578125 1001 1393.578125 c 1
1001 1364.15136719 1001 1334.72363281 1001 1305.296875 c 1
970.270507812 1305.296875 939.541992188 1305.296875 908.8125 1305.296875 c 1
908.8125 1140.79199219 908.8125 976.286132812 908.8125 811.78125 c 1
939.541992188 811.78125 970.270507812 811.78125 1001 811.78125 c 1
1001 782.354492188 1001 752.926757812 1001 723.5 c 1
903.708007812 723.5 806.416992188 723.5 709.125 723.5 c 1
1137.875 1393.578125 m 1
1216.9375 1393.578125 1296 1393.578125 1375.0625 1393.578125 c 1
1417.875 1393.578125 1456.78125 1386.546875 1491.625 1372.484375 c 128
1526.46875 1358.34375 1556.3125 1337.40625 1581 1309.59375 c 128
1605.53125 1281.703125 1624.59375 1246.859375 1638.03125 1204.90625 c 128
1651.46875 1163.03125 1658.1875 1114.203125 1658.1875 1058.578125 c 256
1658.1875 1002.875 1651.46875 954.046875 1638.03125 912.171875 c 128
1624.59375 870.21875 1605.53125 835.375 1581 807.484375 c 128
1556.3125 779.671875 1526.46875 758.734375 1491.625 744.59375 c 128
1456.78125 730.53125 1417.875 723.5 1375.0625 723.5 c 1
1296 723.5 1216.9375 723.5 1137.875 723.5 c 1
1137.875 946.859375 1137.875 1170.21875 1137.875 1393.578125 c 1
1375.0625 819.515625 m 1
1424.90625 819.515625 1465.21875 835.21875 1496 866.546875 c 128
1526.625 897.875 1542.09375 943.96875 1542.09375 1004.75 c 1
1542.09375 1040.609375 1542.09375 1076.46875 1542.09375 1112.328125 c 1
1542.09375 1173.109375 1526.625 1219.203125 1496 1250.53125 c 128
1465.21875 1281.9375 1424.90625 1297.5625 1375.0625 1297.5625 c 1
1332.14550781 1297.5625 1289.22949219 1297.5625 1246.3125 1297.5625 c 1
1246.3125 1138.21386719 1246.3125 978.864257812 1246.3125 819.515625 c 1
1289.22949219 819.515625 1332.14550781 819.515625 1375.0625 819.515625 c 1
EndSplineSet
EndChar
EndChars
EndSplineFont

BIN
res/icons.ttf
View file

Binary file not shown.

1
res/releaseReadme/stable-linux.txt
View file

@ -17,6 +17,7 @@ if you find issues (e.g. bugs or annoyances), report them. links below.
- issues: https://github.com/tildearrow/furnace/issues
- discussion: https://github.com/tildearrow/furnace/discussions
- online manual: https://tildearrow.org/furnace/doc/v0.6.7/
- Furnace on Discord: https://discord.gg/QhA26dXD23
# notes

1
res/releaseReadme/stable-mac.txt
View file

@ -27,6 +27,7 @@ if you find issues (e.g. bugs or annoyances), report them. links below.
- issues: https://github.com/tildearrow/furnace/issues
- discussion: https://github.com/tildearrow/furnace/discussions
- online manual: https://tildearrow.org/furnace/doc/v0.6.7/
- Furnace on Discord: https://discord.gg/QhA26dXD23
# notes

1
res/releaseReadme/stable-win.txt
View file

@ -17,6 +17,7 @@ if you find issues (e.g. bugs or annoyances), report them. links below.
- issues: https://github.com/tildearrow/furnace/issues
- discussion: https://github.com/tildearrow/furnace/discussions
- online manual: https://tildearrow.org/furnace/doc/v0.6.7/
- Furnace on Discord: https://discord.gg/QhA26dXD23
# notes

7
src/engine/cmdStream.cpp
View file

@ -364,6 +364,7 @@ bool DivCSPlayer::tick() {
}
if (sendVolume || chan[i].volSpeed!=0) {
int preSpeedVol=chan[i].volume;
chan[i].volume+=chan[i].volSpeed;
if (chan[i].volSpeedTarget!=-1) {
bool atTarget=false;
@ -377,7 +378,11 @@ bool DivCSPlayer::tick() {
}
if (atTarget) {
chan[i].volume=chan[i].volSpeedTarget;
if (chan[i].volSpeed>0) {
chan[i].volume=MAX(preSpeedVol,chan[i].volSpeedTarget);
} else if (chan[i].volSpeed<0) {
chan[i].volume=MIN(preSpeedVol,chan[i].volSpeedTarget);
}
chan[i].volSpeed=0;
chan[i].volSpeedTarget=-1;
}

46
src/engine/dispatch.h
View file

@ -268,6 +268,46 @@ enum DivDispatchCmds {
DIV_CMD_FM_OPMASK, // (mask)
DIV_CMD_MULTIPCM_MIX_FM, // (value)
DIV_CMD_MULTIPCM_MIX_PCM, // (value)
DIV_CMD_MULTIPCM_LFO, // (value)
DIV_CMD_MULTIPCM_VIB, // (value)
DIV_CMD_MULTIPCM_AM, // (value)
DIV_CMD_MULTIPCM_AR, // (value)
DIV_CMD_MULTIPCM_D1R, // (value)
DIV_CMD_MULTIPCM_DL, // (value)
DIV_CMD_MULTIPCM_D2R, // (value)
DIV_CMD_MULTIPCM_RC, // (value)
DIV_CMD_MULTIPCM_RR, // (value)
DIV_CMD_MULTIPCM_DAMP, // (value)
DIV_CMD_MULTIPCM_PSEUDO_REVERB, // (value)
DIV_CMD_MULTIPCM_LFO_RESET, // (value)
DIV_CMD_MULTIPCM_LEVEL_DIRECT, // (value)
DIV_CMD_SID3_SPECIAL_WAVE,
DIV_CMD_SID3_RING_MOD_SRC,
DIV_CMD_SID3_HARD_SYNC_SRC,
DIV_CMD_SID3_PHASE_MOD_SRC,
DIV_CMD_SID3_WAVE_MIX,
DIV_CMD_SID3_LFSR_FEEDBACK_BITS,
DIV_CMD_SID3_1_BIT_NOISE,
DIV_CMD_SID3_FILTER_DISTORTION,
DIV_CMD_SID3_FILTER_OUTPUT_VOLUME,
DIV_CMD_SID3_CHANNEL_INVERSION,
DIV_CMD_SID3_FILTER_CONNECTION,
DIV_CMD_SID3_FILTER_MATRIX,
DIV_CMD_SID3_FILTER_ENABLE,
DIV_CMD_C64_PW_SLIDE,
DIV_CMD_C64_CUTOFF_SLIDE,
DIV_CMD_SID3_PHASE_RESET,
DIV_CMD_SID3_NOISE_PHASE_RESET,
DIV_CMD_SID3_ENVELOPE_RESET,
DIV_CMD_SID3_CUTOFF_SCALING,
DIV_CMD_SID3_RESONANCE_SCALING,
DIV_CMD_MAX
};
@ -585,10 +625,10 @@ class DivDispatch {
/**
* get "paired" channels.
* @param chan the channel to query.
* @return a DivChannelPair.
* @param ch the channel to query.
* @param ret the DivChannelPair vector of pairs.
*/
virtual DivChannelPair getPaired(int chan);
virtual void getPaired(int ch, std::vector<DivChannelPair>& ret);
/**
* get channel mode hints.

22
src/engine/dispatchContainer.cpp
View file

@ -92,6 +92,7 @@
#include "platform/nds.h"
#include "platform/bifurcator.h"
#include "platform/sid2.h"
#include "platform/sid3.h"
#include "platform/dummy.h"
#include "../ta-log.h"
#include "song.h"
@ -768,6 +769,27 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do
case DIV_SYSTEM_SID2:
dispatch=new DivPlatformSID2;
break;
case DIV_SYSTEM_SID3:
dispatch=new DivPlatformSID3;
break;
case DIV_SYSTEM_OPL4:
dispatch=new DivPlatformOPL;
((DivPlatformOPL*)dispatch)->setOPLType(4,false);
if (isRender) {
((DivPlatformOPL*)dispatch)->setCore(eng->getConfInt("opl4CoreRender",0));
} else {
((DivPlatformOPL*)dispatch)->setCore(eng->getConfInt("opl4Core",0));
}
break;
case DIV_SYSTEM_OPL4_DRUMS:
dispatch=new DivPlatformOPL;
((DivPlatformOPL*)dispatch)->setOPLType(4,true);
if (isRender) {
((DivPlatformOPL*)dispatch)->setCore(eng->getConfInt("opl4CoreRender",0));
} else {
((DivPlatformOPL*)dispatch)->setCore(eng->getConfInt("opl4Core",0));
}
break;
case DIV_SYSTEM_DUMMY:
dispatch=new DivPlatformDummy;
break;

6
src/engine/engine.cpp
View file

@ -1575,9 +1575,9 @@ void* DivEngine::getDispatchChanState(int ch) {
return disCont[dispatchOfChan[ch]].dispatch->getChanState(dispatchChanOfChan[ch]);
}
DivChannelPair DivEngine::getChanPaired(int ch) {
if (ch<0 || ch>=chans) return DivChannelPair();
return disCont[dispatchOfChan[ch]].dispatch->getPaired(dispatchChanOfChan[ch]);
void DivEngine::getChanPaired(int ch, std::vector<DivChannelPair>& ret) {
if (ch<0 || ch>=chans) return;
disCont[dispatchOfChan[ch]].dispatch->getPaired(dispatchChanOfChan[ch],ret);
}
DivChannelModeHints DivEngine::getChanModeHints(int ch) {

6
src/engine/engine.h
View file

@ -54,8 +54,8 @@ class DivWorkPool;
#define DIV_UNSTABLE
#define DIV_VERSION "dev220"
#define DIV_ENGINE_VERSION 220
#define DIV_VERSION "dev222"
#define DIV_ENGINE_VERSION 222
// for imports
#define DIV_VERSION_MOD 0xff01
#define DIV_VERSION_FC 0xff02
@ -1151,7 +1151,7 @@ class DivEngine {
void* getDispatchChanState(int chan);
// get channel pairs
DivChannelPair getChanPaired(int chan);
void getChanPaired(int chan, std::vector<DivChannelPair>& ret);
// get channel mode hints
DivChannelModeHints getChanModeHints(int chan);

255
src/engine/instrument.cpp
View file

@ -106,6 +106,7 @@ bool DivInstrumentC64::operator==(const DivInstrumentC64& other) {
_C(dutyIsAbs) &&
_C(filterIsAbs) &&
_C(noTest) &&
_C(resetDuty) &&
_C(res) &&
_C(cut) &&
_C(hp) &&
@ -174,7 +175,11 @@ bool DivInstrumentMultiPCM::operator==(const DivInstrumentMultiPCM& other) {
_C(rc) &&
_C(lfo) &&
_C(vib) &&
_C(am)
_C(am) &&
_C(damp) &&
_C(pseudoReverb) &&
_C(lfoReset) &&
_C(levelDirect)
);
}
@ -254,6 +259,65 @@ bool DivInstrumentESFM::Operator::operator==(const DivInstrumentESFM::Operator&
);
}
bool DivInstrumentSID3::operator==(const DivInstrumentSID3& other) {
return (
_C(triOn) &&
_C(sawOn) &&
_C(pulseOn) &&
_C(noiseOn) &&
_C(a) &&
_C(d) &&
_C(s) &&
_C(r) &&
_C(sr) &&
_C(duty) &&
_C(ringMod) &&
_C(oscSync) &&
_C(phase_mod) &&
_C(phase_mod_source) &&
_C(ring_mod_source) &&
_C(sync_source) &&
_C(specialWaveOn) &&
_C(oneBitNoise) &&
_C(separateNoisePitch) &&
_C(special_wave) &&
_C(doWavetable) &&
_C(dutyIsAbs) &&
_C(resetDuty) &&
_C(phaseInv) &&
_C(feedback) &&
_C(mixMode) &&
_C(filt[0]) &&
_C(filt[1]) &&
_C(filt[2]) &&
_C(filt[3])
);
}
bool DivInstrumentSID3::Filter::operator==(const DivInstrumentSID3::Filter& other) {
return (
_C(cutoff) &&
_C(resonance) &&
_C(output_volume) &&
_C(distortion_level) &&
_C(mode) &&
_C(enabled) &&
_C(init) &&
_C(filter_matrix) &&
_C(absoluteCutoff) &&
_C(bindCutoffToNote) &&
_C(bindCutoffToNoteStrength) &&
_C(bindCutoffToNoteCenter) &&
_C(bindCutoffToNoteDir) &&
_C(bindCutoffOnNote) &&
_C(bindResonanceToNote) &&
_C(bindResonanceToNoteStrength) &&
_C(bindResonanceToNoteCenter) &&
_C(bindResonanceToNoteDir) &&
_C(bindResonanceOnNote)
);
}
bool DivInstrumentPowerNoise::operator==(const DivInstrumentPowerNoise& other) {
return _C(octave);
}
@ -618,7 +682,7 @@ void DivInstrument::writeFeature64(SafeWriter* w) {
w->writeS(c64.duty);
w->writeS((unsigned short)((c64.cut&4095)|((c64.res&15)<<12)));
w->writeC((c64.res>>4)&15);
w->writeC(((c64.res>>4)&15)|(c64.resetDuty?0x10:0));
FEATURE_END;
}
@ -892,6 +956,14 @@ void DivInstrument::writeFeatureMP(SafeWriter* w) {
w->writeC(multipcm.vib);
w->writeC(multipcm.am);
unsigned char next=(
(multipcm.damp?1:0)&
(multipcm.pseudoReverb?2:0)&
(multipcm.lfoReset?4:0)&
(multipcm.levelDirect?8:0)
);
w->writeC(next);
FEATURE_END;
}
@ -983,6 +1055,80 @@ void DivInstrument::writeFeatureS2(SafeWriter* w) {
FEATURE_END;
}
void DivInstrument::writeFeatureS3(SafeWriter* w) {
FEATURE_BEGIN("S3");
w->writeC(
(sid3.dutyIsAbs?0x80:0)|
(sid3.noiseOn?8:0)|
(sid3.pulseOn?4:0)|
(sid3.sawOn?2:0)|
(sid3.triOn?1:0)
);
w->writeC(sid3.a);
w->writeC(sid3.d);
w->writeC(sid3.s);
w->writeC(sid3.sr);
w->writeC(sid3.r);
w->writeC(sid3.mixMode);
w->writeS(sid3.duty);
w->writeC(
(sid3.phase_mod?0x80:0)|
(sid3.specialWaveOn?0x40:0)|
(sid3.oneBitNoise?0x20:0)|
(sid3.separateNoisePitch?0x10:0)|
(sid3.doWavetable?8:0)|
(sid3.resetDuty?4:0)|
(sid3.oscSync?2:0)|
(sid3.ringMod?1:0)
);
w->writeC(sid3.phase_mod_source);
w->writeC(sid3.ring_mod_source);
w->writeC(sid3.sync_source);
w->writeC(sid3.special_wave);
w->writeC(sid3.phaseInv);
w->writeC(sid3.feedback);
w->writeC(4); // number of filters
for (int i=0; i<4; i++) {
w->writeC(
(sid3.filt[i].enabled?0x80:0)|
(sid3.filt[i].init?0x40:0)|
(sid3.filt[i].absoluteCutoff?0x20:0)|
(sid3.filt[i].bindCutoffToNote?0x10:0)|
(sid3.filt[i].bindCutoffToNoteDir?8:0)|
(sid3.filt[i].bindCutoffOnNote?4:0)|
(sid3.filt[i].bindResonanceToNote?2:0)|
(sid3.filt[i].bindResonanceToNoteDir?1:0)
);
w->writeC(
(sid3.filt[i].bindResonanceOnNote?0x80:0)
);
w->writeS(sid3.filt[i].cutoff);
w->writeC(sid3.filt[i].resonance);
w->writeC(sid3.filt[i].output_volume);
w->writeC(sid3.filt[i].distortion_level);
w->writeC(sid3.filt[i].mode);
w->writeC(sid3.filt[i].filter_matrix);
w->writeC(sid3.filt[i].bindCutoffToNoteStrength);
w->writeC(sid3.filt[i].bindCutoffToNoteCenter);
w->writeC(sid3.filt[i].bindResonanceToNoteStrength);
w->writeC(sid3.filt[i].bindResonanceToNoteCenter);
}
FEATURE_END;
}
void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bool insName) {
size_t blockStartSeek=0;
size_t blockEndSeek=0;
@ -1029,6 +1175,7 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
bool featureEF=false;
bool featurePN=false;
bool featureS2=false;
bool featureS3=false;
bool checkForWL=false;
@ -1272,6 +1419,11 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
feature64=true;
featureS2=true;
break;
case DIV_INS_SID3:
feature64=true;
featureS2=true;
featureS3=true;
break;
case DIV_INS_SUPERVISION:
featureSM=true;
if (amiga.useSample) featureSL=true;
@ -1334,6 +1486,9 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
if (sid2!=defaultIns.sid2) {
featureS2=true;
}
if (sid3!=defaultIns.sid3) {
featureS3=true;
}
}
// check ins name
@ -1485,6 +1640,9 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
if (featureS2) {
writeFeatureS2(w);
}
if (featureS3) {
writeFeatureS3(w);
}
if (fui && (featureSL || featureWL)) {
w->write("EN",2);
@ -1800,7 +1958,12 @@ void DivInstrument::readFeature64(SafeReader& reader, bool& volIsCutoff, short v
c64.res=cr>>12;
if (version>=199) {
c64.res|=((unsigned char)reader.readC())<<4;
next=(unsigned char)reader.readC();
c64.res|=(next&15)<<4;
if (version>=222) {
c64.resetDuty=next&0x10;
}
}
READ_FEAT_END;
@ -2218,6 +2381,14 @@ void DivInstrument::readFeatureMP(SafeReader& reader, short version) {
multipcm.vib=reader.readC();
multipcm.am=reader.readC();
if (version>=221) {
unsigned char next=reader.readC();
multipcm.damp=next&1;
multipcm.pseudoReverb=next&2;
multipcm.lfoReset=next&4;
multipcm.levelDirect=next&8;
}
READ_FEAT_END;
}
@ -2325,6 +2496,82 @@ void DivInstrument::readFeatureS2(SafeReader& reader, short version) {
READ_FEAT_END;
}
void DivInstrument::readFeatureS3(SafeReader& reader, short version) {
READ_FEAT_BEGIN;
unsigned char next=reader.readC();
sid3.dutyIsAbs=next&0x80;
sid3.noiseOn=next&8;
sid3.pulseOn=next&4;
sid3.sawOn=next&2;
sid3.triOn=next&1;
sid3.a=reader.readC();
sid3.d=reader.readC();
sid3.s=reader.readC();
sid3.sr=reader.readC();
sid3.r=reader.readC();
sid3.mixMode=reader.readC();
sid3.duty=reader.readS();
next=reader.readC();
sid3.phase_mod=next&0x80;
sid3.specialWaveOn=next&0x40;
sid3.oneBitNoise=next&0x20;
sid3.separateNoisePitch=next&0x10;
sid3.doWavetable=next&8;
sid3.resetDuty=next&4;
sid3.oscSync=next&2;
sid3.ringMod=next&1;
sid3.phase_mod_source=reader.readC();
sid3.ring_mod_source=reader.readC();
sid3.sync_source=reader.readC();
sid3.special_wave=reader.readC();
sid3.phaseInv=reader.readC();
sid3.feedback=reader.readC();
unsigned char numFilters=reader.readC();
for (int i=0; i<numFilters; i++) {
if (i>=4) break;
next=reader.readC();
sid3.filt[i].enabled=next&0x80;
sid3.filt[i].init=next&0x40;
sid3.filt[i].absoluteCutoff=next&0x20;
sid3.filt[i].bindCutoffToNote=next&0x10;
sid3.filt[i].bindCutoffToNoteDir=next&8;
sid3.filt[i].bindCutoffOnNote=next&4;
sid3.filt[i].bindResonanceToNote=next&2;
sid3.filt[i].bindResonanceToNoteDir=next&1;
next=reader.readC();
sid3.filt[i].bindResonanceOnNote=next&0x80;
sid3.filt[i].cutoff=reader.readS();
sid3.filt[i].resonance=reader.readC();
sid3.filt[i].output_volume=reader.readC();
sid3.filt[i].distortion_level=reader.readC();
sid3.filt[i].mode=reader.readC();
sid3.filt[i].filter_matrix=reader.readC();
sid3.filt[i].bindCutoffToNoteStrength=reader.readC();
sid3.filt[i].bindCutoffToNoteCenter=reader.readC();
sid3.filt[i].bindResonanceToNoteStrength=reader.readC();
sid3.filt[i].bindResonanceToNoteCenter=reader.readC();
}
READ_FEAT_END;
}
DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song) {
unsigned char featCode[2];
bool volIsCutoff=false;
@ -2399,6 +2646,8 @@ DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, b
readFeaturePN(reader,version);
} else if (memcmp(featCode,"S2",2)==0) { // SID2
readFeatureS2(reader,version);
} else if (memcmp(featCode,"S3",2)==0) { // SID3
readFeatureS3(reader,version);
} else {
if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0))) {
// nothing

119
src/engine/instrument.h
View file

@ -98,6 +98,7 @@ enum DivInstrumentType: unsigned short {
DIV_INS_SID2=63, // coincidence!
DIV_INS_SUPERVISION=64,
DIV_INS_UPD1771C=65,
DIV_INS_SID3=66,
DIV_INS_MAX,
DIV_INS_NULL
};
@ -429,7 +430,7 @@ struct DivInstrumentC64 {
unsigned char a, d, s, r;
unsigned short duty;
unsigned char ringMod, oscSync;
bool toFilter, initFilter, dutyIsAbs, filterIsAbs, noTest;
bool toFilter, initFilter, dutyIsAbs, filterIsAbs, noTest, resetDuty;
unsigned char res;
unsigned short cut;
bool hp, lp, bp, ch3off;
@ -456,6 +457,7 @@ struct DivInstrumentC64 {
dutyIsAbs(false),
filterIsAbs(false),
noTest(false),
resetDuty(true),
res(0),
cut(0),
hp(false),
@ -612,6 +614,7 @@ struct DivInstrumentFDS {
struct DivInstrumentMultiPCM {
unsigned char ar, d1r, dl, d2r, rr, rc;
unsigned char lfo, vib, am;
bool damp, pseudoReverb, lfoReset, levelDirect;
bool operator==(const DivInstrumentMultiPCM& other);
bool operator!=(const DivInstrumentMultiPCM& other) {
@ -620,7 +623,11 @@ struct DivInstrumentMultiPCM {
DivInstrumentMultiPCM():
ar(15), d1r(15), dl(0), d2r(0), rr(15), rc(15),
lfo(0), vib(0), am(0) {
lfo(0), vib(0), am(0),
damp(false),
pseudoReverb(false),
lfoReset(false),
levelDirect(true) {
}
};
@ -864,6 +871,111 @@ struct DivInstrumentSID2 {
noiseMode(0) {}
};
struct DivInstrumentSID3 {
bool triOn, sawOn, pulseOn, noiseOn;
unsigned char a, d, s, r;
unsigned char sr;
unsigned short duty;
unsigned char ringMod, oscSync;
bool phase_mod;
unsigned char phase_mod_source, ring_mod_source, sync_source;
bool specialWaveOn;
bool oneBitNoise;
bool separateNoisePitch;
unsigned char special_wave;
bool doWavetable;
bool dutyIsAbs;
bool resetDuty;
unsigned char phaseInv;
unsigned char feedback;
unsigned char mixMode;
struct Filter {
unsigned short cutoff;
unsigned char resonance;
unsigned char output_volume;
unsigned char distortion_level;
unsigned char mode;
bool enabled;
bool init;
unsigned char filter_matrix;
// this is done purely in software
bool absoluteCutoff;
bool bindCutoffToNote;
unsigned char bindCutoffToNoteStrength; // how much cutoff changes over e.g. 1 semitone
unsigned char bindCutoffToNoteCenter; // central note of the cutoff change
bool bindCutoffToNoteDir; // if we decrease or increase cutoff if e.g. we go upper in note space
bool bindCutoffOnNote; // only do cutoff scaling once, on new note
bool bindResonanceToNote;
unsigned char bindResonanceToNoteStrength; // how much resonance changes over e.g. 1 semitone
unsigned char bindResonanceToNoteCenter; // central note of the resonance change
bool bindResonanceToNoteDir; // if we decrease or increase resonance if e.g. we go upper in note space
bool bindResonanceOnNote; // only do resonance scaling once, on new note
bool operator==(const Filter& other);
bool operator!=(const Filter& other) {
return !(*this==other);
}
Filter():
cutoff(0),
resonance(0),
output_volume(0),
distortion_level(0),
mode(0),
enabled(false),
init(false),
filter_matrix(0),
absoluteCutoff(false),
bindCutoffToNote(false),
bindCutoffToNoteStrength(0),
bindCutoffToNoteCenter(0),
bindCutoffToNoteDir(false),
bindCutoffOnNote(false),
bindResonanceToNote(false),
bindResonanceToNoteStrength(0),
bindResonanceToNoteCenter(0),
bindResonanceToNoteDir(false),
bindResonanceOnNote(false) {}
} filt[4];
bool operator==(const DivInstrumentSID3& other);
bool operator!=(const DivInstrumentSID3& other) {
return !(*this==other);
}
DivInstrumentSID3():
triOn(false),
sawOn(true),
pulseOn(false),
noiseOn(false),
a(0),
d(64),
s(0),
r(0),
sr(0),
duty(32768),
ringMod(0),
oscSync(0),
phase_mod(false),
phase_mod_source(0),
ring_mod_source(0),
sync_source(0),
specialWaveOn(false),
oneBitNoise(false),
separateNoisePitch(false),
special_wave(0),
doWavetable(false),
dutyIsAbs(true),
resetDuty(false),
phaseInv(0),
feedback(0),
mixMode(0) {
filt[0].mode=16|32; // default settings so filter just works, connect to input and channel output
filt[0].output_volume=0xff;
}
};
struct DivInstrumentPOD {
DivInstrumentType type;
DivInstrumentFM fm;
@ -882,6 +994,7 @@ struct DivInstrumentPOD {
DivInstrumentESFM esfm;
DivInstrumentPowerNoise powernoise;
DivInstrumentSID2 sid2;
DivInstrumentSID3 sid3;
DivInstrumentPOD() :
type(DIV_INS_FM) {
@ -980,6 +1093,7 @@ struct DivInstrument : DivInstrumentPOD {
void writeFeatureEF(SafeWriter* w);
void writeFeaturePN(SafeWriter* w);
void writeFeatureS2(SafeWriter* w);
void writeFeatureS3(SafeWriter* w);
void readFeatureNA(SafeReader& reader, short version);
void readFeatureFM(SafeReader& reader, short version);
@ -1003,6 +1117,7 @@ struct DivInstrument : DivInstrumentPOD {
void readFeatureEF(SafeReader& reader, short version);
void readFeaturePN(SafeReader& reader, short version);
void readFeatureS2(SafeReader& reader, short version);
void readFeatureS3(SafeReader& reader, short version);
DivDataErrors readInsDataOld(SafeReader& reader, short version);
DivDataErrors readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song);

3
src/engine/platform/abstract.cpp
View file

@ -37,8 +37,7 @@ unsigned short DivDispatch::getPan(int chan) {
return 0;
}
DivChannelPair DivDispatch::getPaired(int chan) {
return DivChannelPair();
void DivDispatch::getPaired(int ch, std::vector<DivChannelPair>& ret) {
}
DivChannelModeHints DivDispatch::getModeHints(int chan) {

7
src/engine/platform/c140.cpp
View file

@ -561,12 +561,11 @@ float DivPlatformC140::getPostAmp() {
return 3.0f;
}
DivChannelPair DivPlatformC140::getPaired(int ch) {
if (!is219) return DivChannelPair();
void DivPlatformC140::getPaired(int ch, std::vector<DivChannelPair>& ret) {
if (!is219) return;
if ((ch&3)==0) {
return DivChannelPair(bankLabel[ch>>2],ch+1,ch+2,ch+3,-1,-1,-1,-1,-1);
ret.push_back(DivChannelPair(bankLabel[ch>>2],ch+1,ch+2,ch+3,-1,-1,-1,-1,-1));
}
return DivChannelPair();
}
const void* DivPlatformC140::getSampleMem(int index) {

2
src/engine/platform/c140.h
View file

@ -89,7 +89,7 @@ class DivPlatformC140: public DivDispatch {
void* getChanState(int chan);
DivMacroInt* getChanMacroInt(int ch);
unsigned short getPan(int chan);
DivChannelPair getPaired(int chan);
void getPaired(int ch, std::vector<DivChannelPair>& ret);
DivDispatchOscBuffer* getOscBuffer(int chan);
unsigned char* getRegisterPool();
int getRegisterPoolSize();

43
src/engine/platform/c64.cpp
View file

@ -158,6 +158,21 @@ void DivPlatformC64::tick(bool sysTick) {
int i=chanOrder[_i];
chan[i].std.next();
if (sysTick) {
if (chan[i].pw_slide!=0) {
chan[i].duty-=chan[i].pw_slide;
chan[i].duty=CLAMP(chan[i].duty,0,0xfff);
rWrite(i*7+2,chan[i].duty&0xff);
rWrite(i*7+3,(chan[i].duty>>8)|(chan[i].outVol<<4));
}
if (cutoff_slide!=0) {
filtCut+=cutoff_slide;
filtCut=CLAMP(filtCut,0,0x7ff);
updateFilter();
}
}
if (chan[i].std.vol.had) {
vol=MIN(15,chan[i].std.vol.val);
willUpdateFilter=true;
@ -305,7 +320,7 @@ int DivPlatformC64::dispatch(DivCommand c) {
chan[c.chan].active=true;
chan[c.chan].keyOn=true;
chan[c.chan].test=false;
if (chan[c.chan].insChanged || chan[c.chan].resetDuty || ins->std.waveMacro.len>0) {
if (((chan[c.chan].insChanged || chan[c.chan].resetDuty || ins->std.waveMacro.len>0) && ins->c64.resetDuty) || chan[c.chan].resetDuty) {
chan[c.chan].duty=ins->c64.duty;
rWrite(c.chan*7+2,chan[c.chan].duty&0xff);
rWrite(c.chan*7+3,chan[c.chan].duty>>8);
@ -535,6 +550,12 @@ int DivPlatformC64::dispatch(DivCommand c) {
chan[c.chan].release=c.value&15;
rWrite(c.chan*7+6,(chan[c.chan].sustain<<4)|(chan[c.chan].release));
break;
case DIV_CMD_C64_PW_SLIDE:
chan[c.chan].pw_slide=c.value*c.value2;
break;
case DIV_CMD_C64_CUTOFF_SLIDE:
cutoff_slide=c.value*c.value2;
break;
case DIV_CMD_MACRO_OFF:
chan[c.chan].std.mask(c.value,true);
break;
@ -600,6 +621,23 @@ DivMacroInt* DivPlatformC64::getChanMacroInt(int ch) {
return &chan[ch].std;
}
void DivPlatformC64::getPaired(int ch, std::vector<DivChannelPair>& ret) {
if (chan[ch].ring) {
if (ch==0){
ret.push_back(DivChannelPair(_("ring"),2));
} else {
ret.push_back(DivChannelPair(_("ring"),(ch-1)%3));
}
}
if (chan[ch].sync) {
if (ch==0) {
ret.push_back(DivChannelPair(_("sync"),2));
} else {
ret.push_back(DivChannelPair(_("sync"),(ch-1)%3));
}
}
}
DivChannelModeHints DivPlatformC64::getModeHints(int ch) {
DivChannelModeHints ret;
ret.count=1;
@ -653,8 +691,11 @@ void DivPlatformC64::reset() {
chan[i].std.setEngine(parent);
fakeLow[i]=0;
fakeBand[i]=0;
chan[i].pw_slide=0;
}
cutoff_slide=0;
if (sidCore==2) {
dSID_init(sid_d,chipClock,rate,sidIs6581?6581:8580,needInitTables);
dSID_setMuteMask(

6
src/engine/platform/c64.h
View file

@ -37,6 +37,7 @@ class DivPlatformC64: public DivDispatch {
short duty;
bool sweepChanged, filter;
bool resetMask, resetFilter, resetDuty, gate, ring, sync, test;
short pw_slide;
Channel():
SharedChannel<signed char>(15),
prevFreq(65535),
@ -56,7 +57,8 @@ class DivPlatformC64: public DivDispatch {
gate(true),
ring(false),
sync(false),
test(false) {}
test(false),
pw_slide(0) {}
};
Channel chan[3];
DivDispatchOscBuffer* oscBuf[3];
@ -76,6 +78,7 @@ class DivPlatformC64: public DivDispatch {
unsigned char writeOscBuf;
unsigned char sidCore;
int filtCut, resetTime, initResetTime;
short cutoff_slide;
bool keyPriority, sidIs6581, needInitTables, no1EUpdate, multiplyRel, macroRace;
unsigned char chanOrder[3];
@ -114,6 +117,7 @@ class DivPlatformC64: public DivDispatch {
bool isVolGlobal();
float getPostAmp();
DivMacroInt* getChanMacroInt(int ch);
void getPaired(int ch, std::vector<DivChannelPair>& ret);
DivChannelModeHints getModeHints(int chan);
void notifyInsDeletion(void* ins);
void poke(unsigned int addr, unsigned short val);

12
src/engine/platform/dave.cpp
View file

@ -524,12 +524,16 @@ unsigned short DivPlatformDave::getPan(int ch) {
return (chan[ch].panL<<8)|chan[ch].panR;
}
// TODO: the rest
DivChannelPair DivPlatformDave::getPaired(int ch) {
void DivPlatformDave::getPaired(int ch, std::vector<DivChannelPair>& ret) {
if (chan[ch].highPass) {
DivChannelPair("high",(ch+1)&3);
ret.push_back(DivChannelPair(_("high"),(ch+1)&3));
}
if (chan[ch].ringMod) {
ret.push_back(DivChannelPair(_("ring"),(ch+2)&3));
}
if (chan[ch].lowPass && ch==3) {
ret.push_back(DivChannelPair(_("low"),2));
}
return DivChannelPair();
}
DivChannelModeHints DivPlatformDave::getModeHints(int ch) {

2
src/engine/platform/dave.h
View file

@ -76,7 +76,7 @@ class DivPlatformDave: public DivDispatch {
void* getChanState(int chan);
DivMacroInt* getChanMacroInt(int ch);
unsigned short getPan(int chan);
DivChannelPair getPaired(int chan);
void getPaired(int ch, std::vector<DivChannelPair>& ret);
DivChannelModeHints getModeHints(int chan);
DivSamplePos getSamplePos(int ch);
DivDispatchOscBuffer* getOscBuffer(int chan);

2
src/engine/platform/gbaminmod.cpp
View file

@ -771,6 +771,8 @@ int DivPlatformGBAMinMod::init(DivEngine* p, int channels, int sugRate, const Di
setFlags(flags);
reset();
maxCPU=0.0; // initialize!
return 16;
}

799
src/engine/platform/opl.cpp
View file

File diff suppressed because it is too large Load diff

69
src/engine/platform/opl.h
View file

@ -29,24 +29,41 @@ extern "C" {
}
#include "sound/ymfm/ymfm_adpcm.h"
#include "sound/ymfm/ymfm_opl.h"
#include "sound/ymfm/ymfm_pcm.h"
#include "sound/ymf278b/ymf278.h"
class DivOPLAInterface: public ymfm::ymfm_interface {
public:
unsigned char* adpcmBMem;
unsigned char* pcmMem;
int sampleBank;
uint8_t ymfm_external_read(ymfm::access_class type, uint32_t address);
void ymfm_external_write(ymfm::access_class type, uint32_t address, uint8_t data);
DivOPLAInterface(): adpcmBMem(NULL), sampleBank(0) {}
DivOPLAInterface(): adpcmBMem(NULL), pcmMem(NULL), sampleBank(0) {}
};
class DivYMF278MemoryInterface: public MemoryInterface {
public:
unsigned char* memory;
DivYMF278MemoryInterface(unsigned size_) : memory(NULL), size(size_) {};
byte operator[](unsigned address) const override;
unsigned getSize() const override { return size; };
void write(unsigned address, byte value) override {};
void clear(byte value) override {};
private:
unsigned size;
};
class DivPlatformOPL: public DivDispatch {
protected:
struct Channel: public SharedChannel<int> {
DivInstrumentFM state;
unsigned char freqH, freqL;
unsigned int freqH, freqL;
int sample, fixedFreq;
bool furnacePCM, fourOp, hardReset;
unsigned char pan;
bool furnacePCM, fourOp, hardReset, writeCtrl;
bool levelDirect, damp, pseudoReverb, lfoReset, ch;
int lfo, vib, am, ar, d1r, d2r, dl, rc, rr;
int pan;
int macroVolMul;
Channel():
SharedChannel<int>(0),
@ -57,14 +74,29 @@ class DivPlatformOPL: public DivDispatch {
furnacePCM(false),
fourOp(false),
hardReset(false),
writeCtrl(false),
levelDirect(true),
damp(false),
pseudoReverb(false),
lfoReset(false),
ch(false),
lfo(0),
vib(0),
am(0),
ar(15),
d1r(15),
d2r(0),
dl(0),
rc(15),
rr(15),
pan(3),
macroVolMul(64) {
state.ops=2;
}
};
Channel chan[20];
DivDispatchOscBuffer* oscBuf[20];
bool isMuted[20];
Channel chan[44];
DivDispatchOscBuffer* oscBuf[44];
bool isMuted[44];
struct QueuedWrite {
unsigned short addr;
unsigned char val;
@ -72,7 +104,7 @@ class DivPlatformOPL: public DivDispatch {
QueuedWrite(): addr(0), val(0), addrOrVal(false) {}
QueuedWrite(unsigned short a, unsigned char v): addr(a), val(v), addrOrVal(false) {}
};
FixedQueue<QueuedWrite,2048> writes;
FixedQueue<QueuedWrite,4096> writes;
unsigned int dacVal;
unsigned int dacVal2;
@ -86,8 +118,12 @@ class DivPlatformOPL: public DivDispatch {
unsigned char* adpcmBMem;
size_t adpcmBMemLen;
unsigned char* pcmMem;
size_t pcmMemLen;
DivOPLAInterface iface;
DivYMF278MemoryInterface pcmMemory;
unsigned int sampleOffB[256];
unsigned int sampleOffPCM[256];
bool sampleLoaded[256];
ymfm::adpcm_b_engine* adpcmB;
@ -97,12 +133,13 @@ class DivPlatformOPL: public DivDispatch {
const unsigned short* chanMap;
const unsigned char* outChanMap;
int chipFreqBase, chipRateBase;
int delay, chipType, oplType, chans, melodicChans, totalChans, adpcmChan, sampleBank, totalOutputs;
int delay, chipType, oplType, chans, melodicChans, totalChans, adpcmChan=-1, pcmChanOffs=-1, sampleBank, totalOutputs, ramSize;
int fmMixL=7, fmMixR=7, pcmMixL=7, pcmMixR=7;
unsigned char lastBusy;
unsigned char drumState;
unsigned char drumVol[5];
unsigned char regPool[512];
unsigned char regPool[768];
bool properDrums, properDrumsSys, dam, dvb;
@ -115,15 +152,17 @@ class DivPlatformOPL: public DivDispatch {
bool update4OpMask, pretendYMU, downsample, compatPan;
short oldWrites[512];
short pendingWrites[512];
short oldWrites[768];
short pendingWrites[768];
// chips
opl3_chip fm;
YMF278 pcm;
ymfm::ym3526* fm_ymfm1;
ymfm::ym3812* fm_ymfm2;
ymfm::y8950* fm_ymfm8950;
ymfm::ymf262* fm_ymfm3;
ymfm::ymf278b* fm_ymfm4;
fmopl2_t fm_lle2;
fmopl3_t fm_lle3;
@ -141,6 +180,7 @@ class DivPlatformOPL: public DivDispatch {
void acquire_nukedLLE3(short** buf, size_t len);
void acquire_nuked(short** buf, size_t len);
void acquire_ymfm3(short** buf, size_t len);
void acquire_ymfm4(short** buf, size_t len);
void acquire_ymfm8950(short** buf, size_t len);
void acquire_ymfm2(short** buf, size_t len);
void acquire_ymfm1(short** buf, size_t len);
@ -151,7 +191,7 @@ class DivPlatformOPL: public DivDispatch {
void* getChanState(int chan);
DivMacroInt* getChanMacroInt(int ch);
unsigned short getPan(int chan);
DivChannelPair getPaired(int chan);
void getPaired(int ch, std::vector<DivChannelPair>& ret);
DivDispatchOscBuffer* getOscBuffer(int chan);
int mapVelocity(int ch, float vel);
float getGain(int ch, int vol);
@ -182,6 +222,9 @@ class DivPlatformOPL: public DivDispatch {
void renderSamples(int chipID);
int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
void quit();
DivPlatformOPL():
pcmMemory(0x400000),
pcm(pcmMemory) {}
~DivPlatformOPL();
};
#endif

12
src/engine/platform/oplAInterface.cpp
View file

@ -28,6 +28,11 @@ uint8_t DivOPLAInterface::ymfm_external_read(ymfm::access_class type, uint32_t a
return 0;
}
return adpcmBMem[address&0x3ffff];
case ymfm::ACCESS_PCM:
if (pcmMem==NULL) {
return 0;
}
return pcmMem[address&0x3fffff];
default:
return 0;
}
@ -36,3 +41,10 @@ uint8_t DivOPLAInterface::ymfm_external_read(ymfm::access_class type, uint32_t a
void DivOPLAInterface::ymfm_external_write(ymfm::access_class type, uint32_t address, uint8_t data) {
}
byte DivYMF278MemoryInterface::operator[](unsigned address) const {
if (memory && address<size) {
return memory[address];
}
return 0;
}

5
src/engine/platform/pce.cpp
View file

@ -538,11 +538,10 @@ unsigned short DivPlatformPCE::getPan(int ch) {
return ((chan[ch].pan&0xf0)<<4)|(chan[ch].pan&15);
}
DivChannelPair DivPlatformPCE::getPaired(int ch) {
void DivPlatformPCE::getPaired(int ch, std::vector<DivChannelPair>& ret) {
if (ch==1 && lfoMode>0) {
return DivChannelPair("mod",0);
ret.push_back(DivChannelPair(_("mod"),0));
}
return DivChannelPair();
}
DivChannelModeHints DivPlatformPCE::getModeHints(int ch) {

2
src/engine/platform/pce.h
View file

@ -85,7 +85,7 @@ class DivPlatformPCE: public DivDispatch {
void* getChanState(int chan);
DivMacroInt* getChanMacroInt(int ch);
unsigned short getPan(int chan);
DivChannelPair getPaired(int chan);
void getPaired(int ch, std::vector<DivChannelPair>& ret);
DivChannelModeHints getModeHints(int chan);
DivSamplePos getSamplePos(int ch);
DivDispatchOscBuffer* getOscBuffer(int chan);

11
src/engine/platform/pokey.cpp
View file

@ -407,22 +407,21 @@ DivMacroInt* DivPlatformPOKEY::getChanMacroInt(int ch) {
return &chan[ch].std;
}
DivChannelPair DivPlatformPOKEY::getPaired(int ch) {
void DivPlatformPOKEY::getPaired(int ch, std::vector<DivChannelPair>& ret) {
switch (ch) {
case 0:
if (audctl&4) return DivChannelPair("filter",2);
if (audctl&4) ret.push_back(DivChannelPair(_("filter"),2));
break;
case 1:
if (audctl&16) return DivChannelPair("16-bit",0);
if (audctl&16) ret.push_back(DivChannelPair(_("16-bit"),0));
break;
case 2:
if (audctl&8) return DivChannelPair("16-bit",3);
if (audctl&8) ret.push_back(DivChannelPair(_("16-bit"),3));
break;
case 3:
if (audctl&2) return DivChannelPair("filter",1);
if (audctl&2) ret.push_back(DivChannelPair(_("filter"),1));
break;
}
return DivChannelPair();
}
DivDispatchOscBuffer* DivPlatformPOKEY::getOscBuffer(int ch) {

2
src/engine/platform/pokey.h
View file

@ -65,7 +65,7 @@ class DivPlatformPOKEY: public DivDispatch {
int dispatch(DivCommand c);
void* getChanState(int chan);
DivMacroInt* getChanMacroInt(int ch);
DivChannelPair getPaired(int chan);
void getPaired(int ch, std::vector<DivChannelPair>& ret);
DivDispatchOscBuffer* getOscBuffer(int chan);
unsigned char* getRegisterPool();
int getRegisterPoolSize();

51
src/engine/platform/sid2.cpp
View file

@ -93,7 +93,10 @@ void DivPlatformSID2::acquire(short** buf, size_t len)
for(int j = 0; j < 3; j++)
{
oscBuf[j]->data[oscBuf[j]->needle++] = sid2->chan_out[j] / 4;
int co=sid2->chan_out[j]>>2;
if (co<-32768) co=-32768;
if (co>32767) co=32767;
oscBuf[j]->data[oscBuf[j]->needle++]=co;
}
}
}
@ -113,6 +116,21 @@ void DivPlatformSID2::tick(bool sysTick) {
bool willUpdateFilter = false;
chan[i].std.next();
if (sysTick) {
if (chan[i].pw_slide!=0) {
chan[i].duty-=chan[i].pw_slide;
chan[i].duty=CLAMP(chan[i].duty,0,0xfff);
rWrite(i*7+2,chan[i].duty&0xff);
rWrite(i*7+3,(chan[i].duty>>8)|(chan[i].outVol<<4));
}
if (chan[i].cutoff_slide!=0) {
chan[i].filtCut+=chan[i].cutoff_slide;
chan[i].filtCut=CLAMP(chan[i].filtCut,0,0xfff);
updateFilter(i);
}
}
if (chan[i].std.vol.had) {
chan[i].outVol=VOL_SCALE_LINEAR(chan[i].vol&15,MIN(15,chan[i].std.vol.val),15);
rWrite(i*7+3,(chan[i].duty>>8) | (chan[i].outVol << 4));
@ -297,7 +315,7 @@ int DivPlatformSID2::dispatch(DivCommand c) {
chan[c.chan].keyOn=true;
chan[c.chan].test=false;
if (chan[c.chan].insChanged || chan[c.chan].resetDuty || ins->std.waveMacro.len>0) {
if (((chan[c.chan].insChanged || chan[c.chan].resetDuty || ins->std.waveMacro.len>0) && ins->c64.resetDuty) || chan[c.chan].resetDuty) {
chan[c.chan].duty=ins->c64.duty;
rWrite(c.chan*7+2,chan[c.chan].duty&0xff);
rWrite(c.chan*7+3,(chan[c.chan].duty>>8) | (chan[c.chan].outVol << 4));
@ -521,6 +539,12 @@ int DivPlatformSID2::dispatch(DivCommand c) {
break;
}
break;
case DIV_CMD_C64_PW_SLIDE:
chan[c.chan].pw_slide=c.value*c.value2;
break;
case DIV_CMD_C64_CUTOFF_SLIDE:
chan[c.chan].cutoff_slide=c.value*c.value2;
break;
case DIV_CMD_MACRO_OFF:
chan[c.chan].std.mask(c.value,true);
break;
@ -574,6 +598,23 @@ DivMacroInt* DivPlatformSID2::getChanMacroInt(int ch) {
return &chan[ch].std;
}
void DivPlatformSID2::getPaired(int ch, std::vector<DivChannelPair>& ret) {
if (chan[ch].ring) {
if (ch==0) {
ret.push_back(DivChannelPair(_("ring"),2));
} else {
ret.push_back(DivChannelPair(_("ring"),(ch-1)%3));
}
}
if (chan[ch].sync) {
if (ch==0) {
ret.push_back(DivChannelPair(_("sync"),2));
} else {
ret.push_back(DivChannelPair(_("sync"),(ch-1)%3));
}
}
}
DivChannelModeHints DivPlatformSID2::getModeHints(int ch) {
DivChannelModeHints ret;
ret.count=1;
@ -581,8 +622,7 @@ DivChannelModeHints DivPlatformSID2::getModeHints(int ch) {
ret.type[0]=0;
if (ch==2 && (chan[ch].filtControl & 8)) {
ret.type[0]=7;
}
else if (!chan[ch].gate) {
} else if (!chan[ch].gate) {
ret.type[0]=4;
}
@ -633,6 +673,9 @@ void DivPlatformSID2::reset() {
chan[i].noise_mode = 0;
rWrite(0x3 + 7 * i,0xf0);
chan[i].cutoff_slide = 0;
chan[i].pw_slide = 0;
}
sid2->reset();

8
src/engine/platform/sid2.h
View file

@ -36,7 +36,8 @@ class DivPlatformSID2: public DivDispatch {
unsigned char noise_mode;
unsigned char mix_mode;
int filtCut;
bool do_pw_sweep_writes, do_cutoff_sweep_writes;
short cutoff_slide;
short pw_slide;
Channel():
SharedChannel<signed char>(15),
prevFreq(0x1ffff),
@ -60,8 +61,8 @@ class DivPlatformSID2: public DivDispatch {
noise_mode(0),
mix_mode(0),
filtCut(0),
do_pw_sweep_writes(false),
do_cutoff_sweep_writes(false) {}
cutoff_slide(0),
pw_slide(0) {}
};
Channel chan[3];
DivDispatchOscBuffer* oscBuf[3];
@ -108,6 +109,7 @@ class DivPlatformSID2: public DivDispatch {
bool isVolGlobal();
float getPostAmp();
DivMacroInt* getChanMacroInt(int ch);
void getPaired(int ch, std::vector<DivChannelPair>& ret);
DivChannelModeHints getModeHints(int chan);
void notifyInsDeletion(void* ins);
void poke(unsigned int addr, unsigned short val);

1411
src/engine/platform/sid3.cpp Normal file
View file

File diff suppressed because it is too large Load diff

276
src/engine/platform/sid3.h Normal file
View file

@ -0,0 +1,276 @@
/**
* Furnace Tracker - multi-system chiptune tracker
* Copyright (C) 2021-2024 tildearrow and contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef _SID3_H
#define _SID3_H
#include "../dispatch.h"
#include "../../fixedQueue.h"
#include "../waveSynth.h"
#include "sound/sid3.h"
class DivPlatformSID3: public DivDispatch {
struct Channel: public SharedChannel<signed short> {
int prevFreq;
unsigned char wave, special_wave, attack, decay, sustain, sr, release;
int duty;
bool resetMask, resetFilter, resetDuty, gate, ring, sync, phase, oneBitNoise;
bool phaseReset, envReset, phaseResetNoise;
bool noiseFreqChanged;
unsigned char vol;
unsigned char noise_mode;
unsigned char mix_mode;
unsigned char ringSrc, syncSrc, phaseSrc;
unsigned char panLeft, panRight;
int noiseFreq;
bool independentNoiseFreq;
unsigned int noiseLFSRMask;
struct Filter
{
int cutoff;
unsigned char resonance;
unsigned char output_volume;
unsigned char distortion_level;
unsigned char mode;
bool enabled;
unsigned char filter_matrix;
short cutoff_slide;
bool bindCutoffToNote; //cutoff scaling
unsigned char bindCutoffToNoteStrength; //how much cutoff changes over e.g. 1 semitone
unsigned char bindCutoffToNoteCenter; //central note of the cutoff change
bool bindCutoffToNoteDir; //if we decrease or increase cutoff if e.g. we go upper in note space
bool bindResonanceToNote;
unsigned char bindResonanceToNoteStrength; //how much resonance changes over e.g. 1 semitone
unsigned char bindResonanceToNoteCenter; //central note of the resonance change
bool bindResonanceToNoteDir; //if we decrease or increase resonance if e.g. we go upper in note space
Filter():
cutoff(0),
resonance(0),
output_volume(0),
distortion_level(0),
mode(0),
enabled(false),
filter_matrix(0),
cutoff_slide(0),
bindCutoffToNote(false),
bindCutoffToNoteStrength(0),
bindCutoffToNoteCenter(0),
bindCutoffToNoteDir(false),
bindResonanceToNote(false),
bindResonanceToNoteStrength(0),
bindResonanceToNoteCenter(0),
bindResonanceToNoteDir(false) {}
} filt[SID3_NUM_FILTERS];
int noise_baseNoteOverride;
bool noise_fixedArp;
int noise_arpOff;
int noise_pitch2;
bool noise_hasArp;
bool noise_hasPitch;
bool pcm;
int wavetable;
long long dacPeriod, dacRate, dacOut;
unsigned long long dacPos;
int dacSample;
unsigned char phaseInv;
unsigned char feedback;
short pw_slide;
short phase_reset_counter;
short noise_phase_reset_counter;
short envelope_reset_counter;
void handleArpNoise(int offset=0)
{
DivMacroStruct& m = this->std.op[3].am;
if (m.had) {
noise_hasArp=true;
if (m.val<0) {
if (!(m.val&0x40000000)) {
noise_baseNoteOverride=(m.val|0x40000000)+offset;
noise_fixedArp=true;
} else {
noise_arpOff=m.val;
noise_fixedArp=false;
}
} else {
if (m.val&0x40000000) {
noise_baseNoteOverride=(m.val&(~0x40000000))+offset;
noise_fixedArp=true;
} else {
noise_arpOff=m.val;
noise_fixedArp=false;
}
}
noiseFreqChanged=true;
}
else
{
noise_hasArp=false;
}
}
void handlePitchNoise()
{
DivMacroStruct& m = this->std.op[0].ar;
if (m.had) {
noise_hasPitch=true;
if (m.mode) {
noise_pitch2+=m.val;
CLAMP_VAR(noise_pitch2,-131071,131071);
} else {
noise_pitch2=m.val;
}
noiseFreqChanged=true;
}
else
{
noise_hasPitch=false;
}
}
Channel():
SharedChannel<signed short>(SID3_MAX_VOL),
prevFreq(0xffffff),
wave(0),
special_wave(0),
attack(0),
decay(0),
sustain(0),
sr(0),
release(0),
duty(0),
resetMask(false),
resetFilter(false),
resetDuty(false),
gate(true),
ring(false),
sync(false),
phase(false),
oneBitNoise(false),
phaseReset(false),
envReset(false),
phaseResetNoise(false),
noiseFreqChanged(false),
vol(SID3_MAX_VOL),
noise_mode(0),
mix_mode(0),
ringSrc(0),
syncSrc(0),
phaseSrc(0),
panLeft(0xff),
panRight(0xff),
noiseFreq(0),
independentNoiseFreq(false),
noiseLFSRMask((1 << 29) | (1 << 5) | (1 << 3) | 1), //https://docs.amd.com/v/u/en-US/xapp052 for 30 bits: 30, 6, 4, 1
pcm(false),
wavetable(-1),
dacPeriod(0),
dacRate(0),
dacOut(0),
dacPos(0),
dacSample(-1),
phaseInv(0),
feedback(0),
pw_slide(0),
phase_reset_counter(-1),
noise_phase_reset_counter(-1),
envelope_reset_counter(-1) {}
};
Channel chan[SID3_NUM_CHANNELS];
DivDispatchOscBuffer* oscBuf[SID3_NUM_CHANNELS];
struct QueuedWrite {
unsigned short addr;
unsigned char val;
QueuedWrite(): addr(0), val(0) {}
QueuedWrite(unsigned short a, unsigned char v): addr(a), val(v) {}
};
FixedQueue<QueuedWrite,SID3_NUM_REGISTERS * 4> writes;
DivWaveSynth ws;
unsigned char writeOscBuf;
SID3* sid3;
unsigned char regPool[SID3_NUM_REGISTERS];
bool isMuted[SID3_NUM_CHANNELS];
unsigned char sampleTick; //used to update streamed sample and not clash with other reg writes at high rate samples
bool updateSample;
bool quarterClock;
friend void putDispatchChip(void*,int);
friend void putDispatchChan(void*,int,int);
void updateFlags(int channel, bool gate);
void updateFilter(int channel, int filter);
void updateFreq(int channel);
void updateNoiseFreq(int channel);
void updateNoiseLFSRMask(int channel);
void updateDuty(int channel);
void updateEnvelope(int channel);
void updatePanning(int channel);
void updateWave();
public:
void acquire(short** buf, size_t len);
int dispatch(DivCommand c);
void* getChanState(int chan);
DivDispatchOscBuffer* getOscBuffer(int chan);
unsigned char* getRegisterPool();
int getRegisterPoolSize();
void reset();
void forceIns();
void tick(bool sysTick=true);
void muteChannel(int ch, bool mute);
void setFlags(const DivConfig& flags);
void notifyInsChange(int ins);
void notifyWaveChange(int wave);
float getPostAmp();
bool getDCOffRequired();
DivMacroInt* getChanMacroInt(int ch);
DivChannelModeHints getModeHints(int chan);
void notifyInsDeletion(void* ins);
void poke(unsigned int addr, unsigned short val);
void poke(std::vector<DivRegWrite>& wlist);
const char** getRegisterSheet();
int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
int getOutputCount();
void getPaired(int ch, std::vector<DivChannelPair>& ret);
void quit();
~DivPlatformSID3();
};
#endif

5
src/engine/platform/snes.cpp
View file

@ -723,11 +723,10 @@ unsigned short DivPlatformSNES::getPan(int ch) {
return (chan[ch].panL<<8)|chan[ch].panR;
}
DivChannelPair DivPlatformSNES::getPaired(int ch) {
void DivPlatformSNES::getPaired(int ch, std::vector<DivChannelPair>& ret) {
if (chan[ch].pitchMod) {
return DivChannelPair("mod",(ch-1)&7);
ret.push_back(DivChannelPair(_("mod"),(ch-1)&7));
}
return DivChannelPair();
}
DivChannelModeHints DivPlatformSNES::getModeHints(int ch) {

2
src/engine/platform/snes.h
View file

@ -106,7 +106,7 @@ class DivPlatformSNES: public DivDispatch {
void* getChanState(int chan);
DivMacroInt* getChanMacroInt(int ch);
unsigned short getPan(int chan);
DivChannelPair getPaired(int chan);
void getPaired(int ch, std::vector<DivChannelPair>& ret);
DivChannelModeHints getModeHints(int chan);
DivSamplePos getSamplePos(int ch);
DivDispatchOscBuffer* getOscBuffer(int chan);

3856
src/engine/platform/sound/sid3.c Normal file
View file

File diff suppressed because it is too large Load diff

285
src/engine/platform/sound/sid3.h Normal file
View file

@ -0,0 +1,285 @@
#ifndef SID3_H
#define SID3_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#define SID3_NUM_CHANNELS 7
#define SID3_NUM_FILTERS 4
#define SID3_REGISTERS_PER_CHANNEL 64
#define SID3_REGISTERS_PER_FILTER 8
#define SID3_NUM_REGISTERS (SID3_NUM_CHANNELS * SID3_REGISTERS_PER_CHANNEL)
#define SID3_MAX_VOL 255
#define SID3_WAVETABLE_LENGTH 256
#define SID3_NUM_WAVEFORM_BITS 5
#define SID3_NUM_UNIQUE_SPECIAL_WAVES 28
#define SID3_NUM_SPECIAL_WAVES (SID3_NUM_UNIQUE_SPECIAL_WAVES * 2 + 2) /* usual and 2x vol clipped + 2x vol clipped tri and saw... */
#define SID3_SPECIAL_WAVE_LENGTH 16384
#define SID3_EXPONENTIAL_LUT_LENGTH ((0xff0000 >> 8) + 1)
#define SID3_ACC_BITS 30
#define SID3_ACC_MASK ((1UL << SID3_ACC_BITS) - 1)
enum Flags
{
SID3_CHAN_ENABLE_GATE = 1,
SID3_CHAN_ENABLE_RING_MOD = 2,
SID3_CHAN_ENABLE_HARD_SYNC = 4,
SID3_CHAN_ENABLE_PHASE_MOD = 8,
SID3_CHAN_PHASE_RESET = 16,
SID3_CHAN_ENV_RESET = 32,
SID3_CHAN_NOISE_PHASE_RESET = 64,
SID3_CHAN_1_BIT_NOISE = 128,
};
enum PhaseInversion
{
SID3_INV_SIGNAL_RIGHT = 1,
SID3_INV_SIGNAL_LEFT = 2,
};
enum Waveforms
{
SID3_WAVE_TRIANGLE = 1,
SID3_WAVE_SAW = 2,
SID3_WAVE_PULSE = 4,
SID3_WAVE_NOISE = 8,
SID3_WAVE_SPECIAL = 16,
};
enum Mixmodes
{
SID3_MIX_8580 = 0,
SID3_MIX_AND = 1,
SID3_MIX_OR = 2,
SID3_MIX_XOR = 3,
SID3_MIX_SUM = 4,
};
enum Filter_modes
{
SID3_FILTER_LP = 1,
SID3_FILTER_HP = 2,
SID3_FILTER_BP = 4,
SID3_FILTER_MODES_MASK = 7,
SID3_FILTER_ENABLE = 8,
SID3_FILTER_CHANNEL_INPUT = 16, //add channel input to filter input
SID3_FILTER_OUTPUT = 32, //output sound from this filter to channel output
};
enum Registers
{
SID3_REGISTER_FLAGS = 0,
SID3_REGISTER_ADSR_A = 1,
SID3_REGISTER_ADSR_D = 2,
SID3_REGISTER_ADSR_S = 3,
SID3_REGISTER_ADSR_SR = 4,
SID3_REGISTER_ADSR_R = 5,
SID3_REGISTER_WAVEFORM = 6,
SID3_REGISTER_PW_HIGH = 7,
SID3_REGISTER_PW_LOW = 8,
SID3_REGISTER_SPECIAL_WAVE = 9,
SID3_REGISTER_FREQ_HIGH = 10,
SID3_REGISTER_FREQ_MID = 11,
SID3_REGISTER_FREQ_LOW = 12,
SID3_REGISTER_ADSR_VOL = 13,
SID3_REGISTER_MIXMODE = 14,
SID3_REGISTER_RING_MOD_SRC = 15,
SID3_REGISTER_SYNC_SRC = 16,
SID3_REGISTER_FILT_BASE = 17,
SID3_REGISTER_FILT_MODE = 17,
SID3_REGISTER_FILT_CUTOFF_HIGH = 18,
SID3_REGISTER_FILT_CUTOFF_LOW = 19,
SID3_REGISTER_FILT_RESONANCE = 20,
SID3_REGISTER_FILT_DISTORTION = 21,
SID3_REGISTER_FILT_CONNECTION = 22,
SID3_REGISTER_FILT_OUTPUT_VOLUME = 23,
SID3_REGISTER_AFTER_FILT_1ST_REG = SID3_REGISTER_FILT_BASE + SID3_REGISTERS_PER_FILTER * SID3_NUM_FILTERS,
SID3_REGISTER_PHASE_MOD_SRC = SID3_REGISTER_AFTER_FILT_1ST_REG,
SID3_REGISTER_PAN_LEFT = SID3_REGISTER_AFTER_FILT_1ST_REG + 1,
SID3_REGISTER_PAN_RIGHT = SID3_REGISTER_AFTER_FILT_1ST_REG + 2,
SID3_REGISTER_NOISE_FREQ_HIGH = SID3_REGISTER_AFTER_FILT_1ST_REG + 3,
SID3_REGISTER_NOISE_FREQ_MID = SID3_REGISTER_AFTER_FILT_1ST_REG + 4,
SID3_REGISTER_NOISE_FREQ_LOW = SID3_REGISTER_AFTER_FILT_1ST_REG + 5,
SID3_REGISTER_NOISE_LFSR_HIGHEST = SID3_REGISTER_AFTER_FILT_1ST_REG + 6,
SID3_REGISTER_NOISE_LFSR_HIGH = SID3_REGISTER_AFTER_FILT_1ST_REG + 7,
SID3_REGISTER_NOISE_LFSR_MID = SID3_REGISTER_AFTER_FILT_1ST_REG + 8,
SID3_REGISTER_NOISE_LFSR_LOW = SID3_REGISTER_AFTER_FILT_1ST_REG + 9,
SID3_REGISTER_STREAMED_SAMPLE_HIGH = SID3_REGISTER_AFTER_FILT_1ST_REG + 10,
SID3_REGISTER_STREAMED_SAMPLE_LOW = SID3_REGISTER_AFTER_FILT_1ST_REG + 11,
SID3_REGISTER_PHASE_INVERSION = SID3_REGISTER_AFTER_FILT_1ST_REG + 12,
SID3_REGISTER_FEEDBACK = SID3_REGISTER_AFTER_FILT_1ST_REG + 13,
};
typedef struct
{
int32_t input;
int32_t output;
// State of filter.
float Vhp; // highpass
float Vbp; // bandpass
float Vlp; // lowpass
// Cutoff frequency, resonance.
float w0, w0_ceil_1;
float _1024_div_Q;
double distortion_multiplier; //pre-calculated distortion multiplier for tanh() simple distortion
double tanh_distortion_multiplier; //pre-calculated tanh(distortion multiplier)
uint16_t cutoff;
uint8_t resonance;
uint8_t distortion_level;
uint8_t mode;
uint8_t output_volume;
} sid3_filter;
typedef struct
{
sid3_filter filt[SID3_NUM_FILTERS];
uint8_t connection_matrix[SID3_NUM_FILTERS];
} sid3_filters_block;
typedef struct
{
uint8_t a, d, s, sr, r, vol, state;
uint32_t envelope_counter;
uint32_t envelope_speed;
bool hold_zero;
} sid3_channel_adsr;
typedef struct
{
uint32_t accumulator;
uint8_t sync_bit;
uint32_t frequency;
uint32_t noise_accumulator;
uint32_t noise_frequency;
uint32_t lfsr, lfsr_taps;
uint8_t waveform;
uint8_t special_wave;
uint16_t pw;
uint8_t mix_mode;
sid3_channel_adsr adsr;
uint8_t flags;
uint8_t ring_mod_src;
uint8_t hard_sync_src;
uint8_t phase_mod_source;
sid3_filters_block filt;
uint8_t clock_filter;
uint8_t panning_left, panning_right;
int32_t output_before_filter;
uint8_t phase_inv;
uint32_t feedback;
int32_t prev_output, prev_output2;
} sid3_channel;
typedef struct
{
uint32_t accumulator;
uint8_t sync_bit;
uint32_t frequency;
uint16_t streamed_sample;
uint8_t wavetable[SID3_WAVETABLE_LENGTH];
uint8_t wave_address;
sid3_channel_adsr adsr;
uint8_t flags;
uint8_t mode;
uint8_t ring_mod_src;
uint8_t hard_sync_src;
uint8_t phase_mod_source;
sid3_filters_block filt;
uint8_t clock_filter;
uint8_t panning_left, panning_right;
int32_t output_before_filter;
uint8_t phase_inv;
} sid3_wavetable_chan;
typedef struct
{
uint16_t special_waves[SID3_NUM_SPECIAL_WAVES][SID3_SPECIAL_WAVE_LENGTH]; //sine wave and OPL3-ish waves + OPZ and YMF825 waves!
uint16_t env_counter_to_exponential_output[SID3_EXPONENTIAL_LUT_LENGTH];
uint32_t exponential_output_to_envelope_counter[SID3_EXPONENTIAL_LUT_LENGTH];
sid3_channel chan[SID3_NUM_CHANNELS - 1];
sid3_wavetable_chan wave_chan;
int32_t output_l, output_r;
int32_t channel_signals_before_ADSR[SID3_NUM_CHANNELS];
int32_t channel_output[SID3_NUM_CHANNELS];
int32_t wave_channel_signal_before_ADSR;
int32_t wave_channel_output;
//emulation-only helpers
bool muted[SID3_NUM_CHANNELS];
uint32_t clock_rate; //in Hz. 1 MHz default
} SID3;
SID3* sid3_create();
void sid3_reset(SID3* sid3);
void sid3_write(SID3* sid3, uint16_t address, uint8_t data);
void sid3_clock(SID3* sid3);
void sid3_set_is_muted(SID3* sid3, uint8_t ch, bool mute);
void sid3_set_clock_rate(SID3* sid3, uint32_t clock);
void sid3_free(SID3* sid3);
#ifdef __cplusplus
};
#endif
#endif

11
src/engine/platform/sound/su.cpp
View file

@ -146,7 +146,8 @@ void SoundUnit::NextSample(short* l, short* r) {
}
}
}
fns[i]=ns[i]*chan[i].vol*((chan[i].flags0&8)?4:2);
fns[i]=ns[i]*chan[i].vol;
if (!(chan[i].flags0&8)) fns[i]>>=1;
if ((chan[i].flags0&0xe0)!=0) {
int ff=chan[i].cutoff;
nslow[i]=nslow[i]+(((ff)*nsband[i])>>16);
@ -259,12 +260,12 @@ void SoundUnit::NextSample(short* l, short* r) {
// mix
if (dsOut) {
tnsL=nsL[dsChannel]<<1;
tnsR=nsR[dsChannel]<<1;
tnsL=nsL[dsChannel]<<3;
tnsR=nsR[dsChannel]<<3;
dsChannel=(dsChannel+1)&7;
} else {
tnsL=(nsL[0]+nsL[1]+nsL[2]+nsL[3]+nsL[4]+nsL[5]+nsL[6]+nsL[7])>>2;
tnsR=(nsR[0]+nsR[1]+nsR[2]+nsR[3]+nsR[4]+nsR[5]+nsR[6]+nsR[7])>>2;
tnsL=(nsL[0]+nsL[1]+nsL[2]+nsL[3]+nsL[4]+nsL[5]+nsL[6]+nsL[7]);
tnsR=(nsR[0]+nsR[1]+nsR[2]+nsR[3]+nsR[4]+nsR[5]+nsR[6]+nsR[7]);
IL1=minval(32767,maxval(-32767,tnsL))>>8;
IL2=minval(32767,maxval(-32767,tnsR))>>8;

12
src/engine/platform/sound/su.h
View file

@ -33,12 +33,12 @@ class SoundUnit {
int rcycle[8];
unsigned int lfsr[8];
signed char ns[8];
int fns[8];
int nsL[8];
int nsR[8];
int nslow[8];
int nshigh[8];
int nsband[8];
short fns[8];
short nsL[8];
short nsR[8];
short nslow[8];
short nshigh[8];
short nsband[8];
int tnsL, tnsR;
unsigned char ilBufPeriod;
unsigned short ilBufPos;

339
src/engine/platform/sound/ymf278b/License.txt Normal file
View file

@ -0,0 +1,339 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program 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 General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

1094
src/engine/platform/sound/ymf278b/ymf278.cpp Normal file
View file

File diff suppressed because it is too large Load diff

155
src/engine/platform/sound/ymf278b/ymf278.h Normal file
View file

@ -0,0 +1,155 @@
#ifndef YMF278_HH
#define YMF278_HH
#include <vector>
#include <string>
#include <algorithm>
#define UNREACHABLE while (1) assert(false)
using byte = uint8_t;
template<typename T>
const T& YMF_clamp(const T& value, const T& min, const T& max) {
return std::min(std::max(value, min), max);
}
class MemoryInterface {
public:
virtual byte operator[](unsigned address) const = 0;
virtual unsigned getSize() const = 0;
virtual void write(unsigned address, byte value) = 0;
virtual void clear(byte value) = 0;
virtual void setMemoryType(bool memoryType) {};
};
class YMF278Base
{
public:
YMF278Base(MemoryInterface& memory, int channelCount, int clockDivider, double clockFrequency);
~YMF278Base();
int getChannelCount();
int getClockDivider();
double getClockFrequency();
void setClockFrequency(double clockFrequency);
double getSampleRate();
virtual void reset();
void generate(short& fleft, short& fright, short& rleft, short& rright, short* channelBufs = nullptr);
class Slot final {
public:
Slot();
void reset();
int compute_rate(int val) const;
int compute_decay_rate(int val) const;
unsigned decay_rate(int num, int sample_rate);
void envelope_next(int sample_rate);
int16_t compute_vib() const;
uint16_t compute_am() const;
template<typename Archive>
void serialize(Archive& ar, unsigned version);
uint32_t startaddr;
uint16_t loopaddr;
uint16_t endaddr; // Note: stored in 2s complement (0x0000 = 0, 0x0001 = -65536, 0xffff = -1)
uint32_t step; // fixed-point frequency step
// invariant: step == calcStep(OCT, FN)
uint32_t stepptr; // fixed-point pointer into the sample
uint16_t pos;
int16_t env_vol;
uint32_t lfo_cnt;
int16_t DL;
uint16_t wave; // wavetable number
uint16_t FN; // f-number TODO store 'FN | 1024'?
int8_t OCT; // octave [-8..+7]
bool PRVB; // pseudo-reverb
uint8_t TLdest; // destination total level
uint8_t TL; // total level (goes towards TLdest)
uint8_t pan; // panpot 0..15
bool ch; // channel select
bool keyon; // slot keyed on
bool DAMP;
uint8_t lfo; // LFO speed 0..7
uint8_t vib; // vibrato 0..7
uint8_t AM; // AM level 0..7
uint8_t AR; // 0..15
uint8_t D1R; // 0..15
uint8_t D2R; // 0..15
uint8_t RC; // rate correction 0..15
uint8_t RR; // 0..15
uint8_t bits; // width of the samples
uint8_t state; // envelope generator state
bool lfo_active;
};
protected:
void keyOnHelper(Slot& slot);
MemoryInterface& memory;
std::vector<Slot> slots;
private:
int16_t getSample(Slot& slot, uint16_t pos) const;
static uint16_t nextPos(Slot& slot, uint16_t pos, uint16_t increment);
void advance();
bool anyActive();
/** Global envelope generator counter. */
unsigned eg_cnt;
unsigned channelCount, clockDivider;
double clockFrequency;
};
class YMF278 final : public YMF278Base {
public:
YMF278(MemoryInterface& memory);
void reset() override;
void writeReg(byte reg, byte data);
byte readReg(byte reg);
byte peekReg(byte reg) const;
void generateMix(short fmL, short fmR, short& bufFL, short& bufFR, short& bufRL, short& bufRR, short* channelBufs = nullptr) {
generate(bufFL, bufFR, bufRL, bufRR, channelBufs);
bufFL = std::min(std::max((pcmMixL * bufFL + fmMixL * fmL) >> 4, -0x8000), 0x7fff);
bufFR = std::min(std::max((pcmMixR * bufFR + fmMixR * fmR) >> 4, -0x8000), 0x7fff);;
}
private:
int fmMixL, fmMixR, pcmMixL, pcmMixR;
int memAdr;
byte regs[256];
};
class YMW258 final : public YMF278Base {
public:
YMW258(MemoryInterface& memory);
void writeReg(byte channel, byte reg, byte data);
};
class MemoryMoonSound : MemoryInterface {
public:
MemoryMoonSound(MemoryInterface& rom, MemoryInterface& ram);
byte operator[](unsigned address) const override;
unsigned getSize() const override;
void write(unsigned address, byte value) override;
void clear(byte value) override;
void setMemoryType(bool memoryType) override;
private:
unsigned getRamAddress(unsigned addr) const;
MemoryInterface& rom;
MemoryInterface& ram;
bool memoryType;
};
#endif

2
src/engine/platform/sound/ymfm/ymfm_opl.h
View file

@ -791,6 +791,8 @@ public:
// generate samples of sound
void generate(output_data *output, uint32_t numsamples = 1);
fm_engine* debug_fm_engine() { return &m_fm; }
pcm_engine* debug_pcm_engine() { return &m_pcm; }
protected:
// internal state
uint16_t m_address; // address register

3
src/engine/platform/sound/ymfm/ymfm_pcm.cpp
View file

@ -309,6 +309,7 @@ void pcm_channel::clock(uint32_t env_counter)
void pcm_channel::output(output_data &output) const
{
m_output[0] = m_output[1] = m_output[2] = m_output[3] = 0;
// early out if the envelope is effectively off
uint32_t envelope = m_env_attenuation;
if (envelope > EG_QUIET)
@ -340,6 +341,8 @@ void pcm_channel::output(output_data &output) const
uint32_t outnum = m_regs.ch_output_channel(m_choffs) * 2;
output.data[outnum + 0] += (lvol * sample) >> 15;
output.data[outnum + 1] += (rvol * sample) >> 15;
m_output[outnum + 0] = output.data[outnum + 0];
m_output[outnum + 1] = output.data[outnum + 1];
}

5
src/engine/platform/sound/ymfm/ymfm_pcm.h
View file

@ -267,6 +267,8 @@ public:
// load a new wavetable entry
void load_wavetable();
int32_t debug_output(uint32_t index) const { return m_output[index]; }
private:
// internal helpers
void start_attack();
@ -291,6 +293,7 @@ private:
pcm_cache m_cache; // cached data
pcm_registers &m_regs; // reference to registers
pcm_engine &m_owner; // reference to our owner
mutable int32_t m_output[4];
};
@ -331,6 +334,8 @@ public:
// return a reference to our registers
pcm_registers &regs() { return m_regs; }
// simple getters for debugging
pcm_channel *debug_channel(uint32_t index) const { return m_channel[index].get(); }
private:
// internal state
ymfm_interface &m_intf; // reference to the interface

29
src/engine/platform/su.cpp
View file

@ -67,6 +67,22 @@ void DivPlatformSoundUnit::writeControlUpper(int ch) {
void DivPlatformSoundUnit::tick(bool sysTick) {
for (int i=0; i<8; i++) {
chan[i].std.next();
if (sysTick) {
if (chan[i].pw_slide!=0) {
chan[i].virtual_duty-=chan[i].pw_slide;
chan[i].virtual_duty=CLAMP(chan[i].virtual_duty,0,0xfff);
chan[i].duty=chan[i].virtual_duty>>5;
chWrite(i,0x08,chan[i].duty);
}
if (chan[i].cutoff_slide!=0) {
chan[i].cutoff+=chan[i].cutoff_slide*4;
chan[i].cutoff=CLAMP(chan[i].cutoff,0,0x3fff);
chWrite(i,0x06,chan[i].cutoff&0xff);
chWrite(i,0x07,chan[i].cutoff>>8);
}
}
if (chan[i].std.vol.had) {
DivInstrument* ins=parent->getIns(chan[i].ins,DIV_INS_SU);
if (ins->type==DIV_INS_AMIGA) {
@ -86,6 +102,7 @@ void DivPlatformSoundUnit::tick(bool sysTick) {
}
if (chan[i].std.duty.had) {
chan[i].duty=chan[i].std.duty.val;
chan[i].virtual_duty=(unsigned short)chan[i].duty<<5;
chWrite(i,0x08,chan[i].duty);
}
if (chan[i].std.wave.had) {
@ -351,6 +368,7 @@ int DivPlatformSoundUnit::dispatch(DivCommand c) {
break;
case DIV_CMD_STD_NOISE_MODE:
chan[c.chan].duty=c.value&127;
chan[c.chan].virtual_duty=(unsigned short)chan[c.chan].duty << 5;
chWrite(c.chan,0x08,chan[c.chan].duty);
break;
case DIV_CMD_C64_RESONANCE:
@ -498,6 +516,12 @@ int DivPlatformSoundUnit::dispatch(DivCommand c) {
if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will && !NEW_ARP_STRAT) chan[c.chan].baseFreq=NOTE_SU(c.chan,chan[c.chan].note);
chan[c.chan].inPorta=c.value;
break;
case DIV_CMD_C64_PW_SLIDE:
chan[c.chan].pw_slide=c.value*c.value2;
break;
case DIV_CMD_C64_CUTOFF_SLIDE:
chan[c.chan].cutoff_slide=c.value*c.value2;
break;
case DIV_CMD_GET_VOLMAX:
return 127;
break;
@ -564,6 +588,11 @@ void DivPlatformSoundUnit::reset() {
for (int i=0; i<8; i++) {
chan[i]=DivPlatformSoundUnit::Channel();
chan[i].std.setEngine(parent);
chan[i].cutoff_slide=0;
chan[i].pw_slide=0;
chan[i].virtual_duty=0x800; // for some reason duty by default is 50%
}
if (dumpWrites) {
addWrite(0xffffffff,0);

8
src/engine/platform/su.h
View file

@ -38,6 +38,9 @@ class DivPlatformSoundUnit: public DivDispatch {
signed short wave;
unsigned short hwSeqPos;
short hwSeqDelay;
short cutoff_slide;
short pw_slide;
short virtual_duty;
Channel():
SharedChannel<signed char>(127),
cutoff(16383),
@ -71,7 +74,10 @@ class DivPlatformSoundUnit: public DivDispatch {
syncTimer(0),
wave(0),
hwSeqPos(0),
hwSeqDelay(0) {}
hwSeqDelay(0),
cutoff_slide(0),
pw_slide(0),
virtual_duty(0) {}
};
Channel chan[8];
DivDispatchOscBuffer* oscBuf[8];

71
src/engine/playback.cpp
View file

@ -266,7 +266,46 @@ const char* cmdName[]={
"FDS_MOD_AUTO",
"FM_OPMASK"
"FM_OPMASK",
"MULTIPCM_MIX_FM",
"MULTIPCM_MIX_PCM",
"MULTIPCM_LFO",
"MULTIPCM_VIB",
"MULTIPCM_AM",
"MULTIPCM_AR",
"MULTIPCM_D1R",
"MULTIPCM_DL",
"MULTIPCM_D2R",
"MULTIPCM_RR",
"MULTIPCM_RC",
"MULTIPCM_DAMP",
"MULTIPCM_PSEUDO_REVERB",
"MULTIPCM_LFO_RESET",
"MULTIPCM_LEVEL_DIRECT",
"SID3_SPECIAL_WAVE",
"SID3_RING_MOD_SRC",
"SID3_HARD_SYNC_SRC",
"SID3_PHASE_MOD_SRC",
"SID3_WAVE_MIX",
"SID3_LFSR_FEEDBACK_BITS",
"SID3_1_BIT_NOISE",
"SID3_FILTER_DISTORTION",
"SID3_FILTER_OUTPUT_VOLUME",
"SID3_CHANNEL_INVERSION",
"SID3_FILTER_CONNECTION",
"SID3_FILTER_MATRIX",
"SID3_FILTER_ENABLE",
"C64_PW_SLIDE",
"C64_CUTOFF_SLIDE",
"SID3_PHASE_RESET",
"SID3_NOISE_PHASE_RESET",
"SID3_ENVELOPE_RESET",
"SID3_CUTOFF_SCALING",
"SID3_RESONANCE_SCALING"
};
static_assert((sizeof(cmdName)/sizeof(void*))==DIV_CMD_MAX,"update cmdName!");
@ -536,7 +575,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
bool comparison=(song.delayBehavior==1)?(effectVal<=nextSpeed):(effectVal<(nextSpeed*(curSubSong->timeBase+1)));
if (song.delayBehavior==2) comparison=true;
if (comparison) {
chan[i].rowDelay=effectVal+1;
chan[i].rowDelay=effectVal;
chan[i].delayOrder=whatOrder;
chan[i].delayRow=whatRow;
if (effectVal==nextSpeed) {
@ -1580,6 +1619,19 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
if (--subticks<=0) {
subticks=tickMult;
// apply delayed rows before potentially advancing to a new row, which would overwrite the
// delayed row's state before it has a chance to do anything. a typical example would be
// a delay scheduling a note-on to be simultaneous with the next row, and the next row also
// containing a delayed note. if we don't apply the delayed row first,
for (int i=0; i<chans; i++) {
// delay effects
if (chan[i].rowDelay>0) {
if (--chan[i].rowDelay==0) {
processRow(i,true);
}
}
}
if (stepPlay!=1) {
tempoAccum+=(skipping && virtualTempoN<virtualTempoD)?virtualTempoD:virtualTempoN;
while (tempoAccum>=virtualTempoD) {
@ -1610,15 +1662,9 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
// under no circumstances shall the accumulator become this large
if (tempoAccum>1023) tempoAccum=1023;
}
// process stuff
if (!shallStop) for (int i=0; i<chans; i++) {
// delay effects
if (chan[i].rowDelay>0) {
if (--chan[i].rowDelay==0) {
processRow(i,true);
}
}
// retrigger
if (chan[i].retrigSpeed) {
if (--chan[i].retrigTick<0) {
@ -1632,6 +1678,7 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
if (!song.noSlidesOnFirstTick || !firstTick) {
if (chan[i].volSpeed!=0) {
chan[i].volume=(chan[i].volume&0xff)|(dispatchCmd(DivCommand(DIV_CMD_GET_VOLUME,i))<<8);
int preSpeedVol=chan[i].volume;
chan[i].volume+=chan[i].volSpeed;
if (chan[i].volSpeedTarget!=-1) {
bool atTarget=false;
@ -1645,7 +1692,11 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
}
if (atTarget) {
chan[i].volume=chan[i].volSpeedTarget;
if (chan[i].volSpeed>0) {
chan[i].volume=MAX(preSpeedVol,chan[i].volSpeedTarget);
} else if (chan[i].volSpeed<0) {
chan[i].volume=MIN(preSpeedVol,chan[i].volSpeedTarget);
}
chan[i].volSpeed=0;
chan[i].volSpeedTarget=-1;
dispatchCmd(DivCommand(DIV_CMD_HINT_VOLUME,i,chan[i].volume>>8));

39
src/engine/sample.cpp
View file

@ -285,6 +285,9 @@ int DivSample::getSampleOffset(int offset, int length, DivSampleDepth depth) {
case DIV_SAMPLE_DEPTH_IMA_ADPCM:
off=(offset+1)/2;
break;
case DIV_SAMPLE_DEPTH_12BIT:
off=((offset*3)+1)/2;
break;
case DIV_SAMPLE_DEPTH_16BIT:
off=offset*2;
break;
@ -348,6 +351,10 @@ int DivSample::getSampleOffset(int offset, int length, DivSampleDepth depth) {
off=(offset+1)/2;
len=(length+1)/2;
break;
case DIV_SAMPLE_DEPTH_12BIT:
off=((offset*3)+1)/2;
len=((length*3)+1)/2;
break;
case DIV_SAMPLE_DEPTH_16BIT:
off=offset*2;
len=length*2;
@ -409,6 +416,9 @@ int DivSample::getEndPosition(DivSampleDepth depth) {
case DIV_SAMPLE_DEPTH_IMA_ADPCM:
off=lengthIMA;
break;
case DIV_SAMPLE_DEPTH_12BIT:
off=length12;
break;
case DIV_SAMPLE_DEPTH_16BIT:
off=length16;
break;
@ -606,6 +616,12 @@ bool DivSample::initInternal(DivSampleDepth d, int count) {
dataIMA=new unsigned char[lengthIMA];
memset(dataIMA,0,lengthIMA);
break;
case DIV_SAMPLE_DEPTH_12BIT: // 12-bit PCM (MultiPCM)
if (data12!=NULL) delete[] data12;
length12=((count*3)+1)/2;
data12=new unsigned char[length12];
memset(data12,0,length12);
break;
case DIV_SAMPLE_DEPTH_16BIT: // 16-bit
if (data16!=NULL) delete[] data16;
length16=count*2;
@ -1293,6 +1309,14 @@ void DivSample::render(unsigned int formatMask) {
case DIV_SAMPLE_DEPTH_IMA_ADPCM: // IMA ADPCM
if (adpcm_decode_block(data16,dataIMA,lengthIMA,samples)==0) logE("oh crap!");
break;
case DIV_SAMPLE_DEPTH_12BIT: // 12-bit PCM (MultiPCM)
for (unsigned int i=0, j=0; i<samples; i+=2, j+=3) {
data16[i+0]=(data12[j+0]<<8)|(data12[j+1]&0xf0);
if (i+1<samples) {
data16[i+1]=(data12[j+2]<<8)|((data12[j+1]<<4)&0xf0);
}
}
break;
default:
return;
}
@ -1482,6 +1506,16 @@ void DivSample::render(unsigned int formatMask) {
adpcm_free_context(codec);
}
}
if (NOT_IN_FORMAT(DIV_SAMPLE_DEPTH_12BIT)) { // 12-bit PCM (MultiPCM)
if (!initInternal(DIV_SAMPLE_DEPTH_12BIT,samples)) return;
for (unsigned int i=0, j=0; i<samples; i+=2, j+=3) {
data12[j+0]=data16[i+0]>>8;
data12[j+1]=((data16[i+0]>>4)&0xf)|(i+1<samples?(data16[i+1]>>4)&0xf:0);
if (i+1<samples) {
data12[j+2]=data16[i+1]>>8;
}
}
}
}
void* DivSample::getCurBuf() {
@ -1512,6 +1546,8 @@ void* DivSample::getCurBuf() {
return dataC219;
case DIV_SAMPLE_DEPTH_IMA_ADPCM:
return dataIMA;
case DIV_SAMPLE_DEPTH_12BIT:
return data12;
case DIV_SAMPLE_DEPTH_16BIT:
return data16;
default:
@ -1548,6 +1584,8 @@ unsigned int DivSample::getCurBufLen() {
return lengthC219;
case DIV_SAMPLE_DEPTH_IMA_ADPCM:
return lengthIMA;
case DIV_SAMPLE_DEPTH_12BIT:
return length12;
case DIV_SAMPLE_DEPTH_16BIT:
return length16;
default:
@ -1662,4 +1700,5 @@ DivSample::~DivSample() {
if (dataMuLaw) delete[] dataMuLaw;
if (dataC219) delete[] dataC219;
if (dataIMA) delete[] dataIMA;
if (data12) delete[] data12;
}

7
src/engine/sample.h
View file

@ -47,6 +47,7 @@ enum DivSampleDepth: unsigned char {
DIV_SAMPLE_DEPTH_MULAW=11,
DIV_SAMPLE_DEPTH_C219=12,
DIV_SAMPLE_DEPTH_IMA_ADPCM=13,
DIV_SAMPLE_DEPTH_12BIT=14,
DIV_SAMPLE_DEPTH_16BIT=16,
DIV_SAMPLE_DEPTH_MAX // boundary for sample depth
};
@ -118,6 +119,7 @@ struct DivSample {
// - 11: 8-bit µ-law PCM
// - 12: C219 "µ-law" PCM
// - 13: IMA ADPCM
// - 14: 12-bit PCM (MultiPCM)
// - 16: 16-bit PCM
DivSampleDepth depth;
bool loop, brrEmphasis, brrNoFilter, dither;
@ -144,8 +146,9 @@ struct DivSample {
unsigned char* dataMuLaw; // 11
unsigned char* dataC219; // 12
unsigned char* dataIMA; // 13
unsigned char* data12; // 14
unsigned int length8, length16, length1, lengthDPCM, lengthZ, lengthQSoundA, lengthA, lengthB, lengthK, lengthBRR, lengthVOX, lengthMuLaw, lengthC219, lengthIMA;
unsigned int length8, length16, length1, lengthDPCM, lengthZ, lengthQSoundA, lengthA, lengthB, lengthK, lengthBRR, lengthVOX, lengthMuLaw, lengthC219, lengthIMA, length12;
unsigned int samples;
@ -356,6 +359,7 @@ struct DivSample {
dataMuLaw(NULL),
dataC219(NULL),
dataIMA(NULL),
data12(NULL),
length8(0),
length16(0),
length1(0),
@ -370,6 +374,7 @@ struct DivSample {
lengthMuLaw(0),
lengthC219(0),
lengthIMA(0),
length12(0),
samples(0) {
for (int i=0; i<DIV_MAX_CHIPS; i++) {
for (int j=0; j<DIV_MAX_SAMPLE_TYPE; j++) {

1
src/engine/song.h
View file

@ -143,6 +143,7 @@ enum DivSystem {
DIV_SYSTEM_SID2,
DIV_SYSTEM_SUPERVISION,
DIV_SYSTEM_UPD1771C,
DIV_SYSTEM_SID3,
DIV_SYSTEM_MAX
};

152
src/engine/sysDef.cpp
View file

@ -602,6 +602,25 @@ void DivEngine::registerSystems() {
{0x5b, {DIV_CMD_FM_KSR, _("5Bxy: Set whether key will scale envelope (x: operator from 1 to 4 (0 for all ops); y: enabled)"), effectOpVal<4>, effectValAnd<1>}},
};
EffectHandlerMap fmOPL4PostEffectHandlerMap(fmOPLPostEffectHandlerMap);
fmOPL4PostEffectHandlerMap.insert({
{0x1e, {DIV_CMD_MULTIPCM_MIX_FM, _("1Exy: FM global level (x: left, y: right; 0 to 7)"), effectVal}},
{0x1f, {DIV_CMD_MULTIPCM_MIX_PCM, _("1Fxy: PCM global level (x: left, y: right; 0 to 7)"), effectVal}},
{0x20, {DIV_CMD_MULTIPCM_LFO, _("20xx: PCM LFO Rate (0 to 7)"), effectValAnd<7>}},
{0x21, {DIV_CMD_MULTIPCM_VIB, _("21xx: PCM LFO PM Depth (0 to 7)"), effectValAnd<7>}},
{0x22, {DIV_CMD_MULTIPCM_AM, _("22xx: PCM LFO AM Depth (0 to 7)"), effectValAnd<7>}},
{0x23, {DIV_CMD_MULTIPCM_AR, _("23xx: PCM Attack Rate (0 to 15)"), effectValAnd<15>}},
{0x24, {DIV_CMD_MULTIPCM_D1R, _("24xx: PCM Decay 1 Rate (0 to 15)"), effectValAnd<15>}},
{0x25, {DIV_CMD_MULTIPCM_DL, _("25xx: PCM Decay Level (0 to 15)"), effectValAnd<15>}},
{0x26, {DIV_CMD_MULTIPCM_D2R, _("26xx: PCM Decay 2 Rate (0 to 15)"), effectValAnd<15>}},
{0x27, {DIV_CMD_MULTIPCM_RR, _("27xx: PCM Release Rate (0 to 15)"), effectValAnd<15>}},
{0x28, {DIV_CMD_MULTIPCM_RC, _("28xx: PCM Rate Correction (0 to 15)"), effectValAnd<15>}},
{0x2c, {DIV_CMD_MULTIPCM_DAMP, _("2Cxx: PCM Damp"), effectValAnd<1>}},
{0x2d, {DIV_CMD_MULTIPCM_PSEUDO_REVERB, _("2Dxx: PCM Pseudo Reverb"), effectValAnd<1>}},
{0x2e, {DIV_CMD_MULTIPCM_LFO_RESET, _("2Exx: PCM LFO Reset"), effectValAnd<1>}},
{0x2f, {DIV_CMD_MULTIPCM_LEVEL_DIRECT, _("2Fxx: PCM Level Direct"), effectValAnd<1>}},
});
EffectHandlerMap c64PostEffectHandlerMap={
{0x10, {DIV_CMD_WAVE, _("10xx: Set waveform (bit 0: triangle; bit 1: saw; bit 2: pulse; bit 3: noise)")}},
{0x11, {DIV_CMD_C64_CUTOFF, _("11xx: Set coarse cutoff (not recommended; use 4xxx instead)")}},
@ -615,6 +634,12 @@ void DivEngine::registerSystems() {
{0x1e, {DIV_CMD_C64_EXTENDED, _("1Exy: Change other parameters (LEGACY)")}},
{0x20, {DIV_CMD_C64_AD, _("20xy: Set attack/decay (x: attack; y: decay)")}},
{0x21, {DIV_CMD_C64_SR, _("21xy: Set sustain/release (x: sustain; y: release)")}},
{0x22, {DIV_CMD_C64_PW_SLIDE, _("22xx: Pulse width slide up"), effectVal, constVal<1>}},
{0x23, {DIV_CMD_C64_PW_SLIDE, _("23xx: Pulse width slide down"), effectVal, constVal<-1>}},
{0x24, {DIV_CMD_C64_CUTOFF_SLIDE, _("24xx: Filter cutoff slide up"), effectVal, constVal<1>}},
{0x25, {DIV_CMD_C64_CUTOFF_SLIDE, _("25xx: Filter cutoff slide down"), effectVal, constVal<-1>}},
};
const EffectHandler c64FineDutyHandler(DIV_CMD_C64_FINE_DUTY, _("3xxx: Set pulse width (0 to FFF)"), effectValLong<12>);
const EffectHandler c64FineCutoffHandler(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff (0 to 7FF)"), effectValLong<11>);
@ -687,12 +712,97 @@ void DivEngine::registerSystems() {
{0x14, {DIV_CMD_C64_FILTER_RESET, _("14xy: Reset cutoff (x: on new note; y: now)")}},
{0x15, {DIV_CMD_C64_DUTY_RESET, _("15xy: Reset pulse width (x: on new note; y: now)")}},
{0x16, {DIV_CMD_C64_EXTENDED, _("16xy: Change other parameters")}},
{0x17, {DIV_CMD_C64_PW_SLIDE, _("17xx: Pulse width slide up"), effectVal, constVal<1>}},
{0x18, {DIV_CMD_C64_PW_SLIDE, _("18xx: Pulse width slide down"), effectVal, constVal<-1>}},
{0x19, {DIV_CMD_C64_CUTOFF_SLIDE, _("19xx: Filter cutoff slide up"), effectVal, constVal<1>}},
{0x1A, {DIV_CMD_C64_CUTOFF_SLIDE, _("1Axx: Filter cutoff slide down"), effectVal, constVal<-1>}},
};
const EffectHandler SID2FineDutyHandler(DIV_CMD_C64_FINE_DUTY, _("3xxx: Set pulse width (0 to FFF)"), effectValLong<12>);
const EffectHandler SID2FineCutoffHandler(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff (0 to FFF)"), effectValLong<11>);
for (int i=0; i<16; i++) SID2PostEffectHandlerMap.emplace(0x30+i,SID2FineDutyHandler);
for (int i=0; i<16; i++) SID2PostEffectHandlerMap.emplace(0x40+i,SID2FineCutoffHandler);
EffectHandlerMap SID3PostEffectHandlerMap={
{0x60, {DIV_CMD_WAVE, _("60xx: Set waveform (bit 0: triangle; bit 1: saw; bit 2: pulse; bit 3: noise; bit 4: special wave)")}},
{0x61, {DIV_CMD_SID3_SPECIAL_WAVE, _("61xx: Set special wave (00-39)")}},
{0x62, {DIV_CMD_C64_EXTENDED, _("62xx: Modulation control (bit 0: ring mod; bit 1: osc. sync; bit 2: phase mod)")}},
{0x63, {DIV_CMD_C64_DUTY_RESET, _("63xy: Reset pulse width (x: on new note; y: now)")}},
{0x64, {DIV_CMD_SID3_RING_MOD_SRC, _("64xx: Set ring modulation source channel (0-7)")}},
{0x65, {DIV_CMD_SID3_HARD_SYNC_SRC, _("65xx: Set hard sync source channel (0-6)")}},
{0x66, {DIV_CMD_SID3_PHASE_MOD_SRC, _("66xx: Set phase modulation source channel (0-6)")}},
{0x67, {DIV_CMD_FM_AR, _("67xx: Set attack")}},
{0x68, {DIV_CMD_FM_DR, _("68xx: Set decay")}},
{0x69, {DIV_CMD_FM_SL, _("69xx: Set sustain level")}},
{0x6A, {DIV_CMD_FM_D2R, _("6Axx: Set sustain rate")}},
{0x6B, {DIV_CMD_FM_RR, _("6Bxx: Set release")}},
{0x6C, {DIV_CMD_SID3_WAVE_MIX, _("6Cxx: Set wave mix mode (0-4)")}},
{0x6D, {DIV_CMD_SID3_LFSR_FEEDBACK_BITS, _("6Dxx: Set noise LFSR feedback bits (low byte)"), effectVal, constVal<0>}},
{0x6E, {DIV_CMD_SID3_LFSR_FEEDBACK_BITS, _("6Exx: Set noise LFSR feedback bits (medium byte)"), effectVal, constVal<1>}},
{0x6F, {DIV_CMD_SID3_LFSR_FEEDBACK_BITS, _("6Fxx: Set noise LFSR feedback bits (higher byte)"), effectVal, constVal<2>}},
{0x70, {DIV_CMD_SID3_LFSR_FEEDBACK_BITS, _("70xx: Set noise LFSR feedback bits (highest bits, 0-3F)"), effectVal, constVal<3>}},
{0x71, {DIV_CMD_C64_RESONANCE, _("71xx: Set filter 1 resonance"), effectVal, constVal<0>}},
{0x72, {DIV_CMD_C64_RESONANCE, _("72xx: Set filter 2 resonance"), effectVal, constVal<1>}},
{0x73, {DIV_CMD_C64_RESONANCE, _("73xx: Set filter 3 resonance"), effectVal, constVal<2>}},
{0x74, {DIV_CMD_C64_RESONANCE, _("74xx: Set filter 4 resonance"), effectVal, constVal<3>}},
{0x75, {DIV_CMD_SID3_1_BIT_NOISE, _("75xx: Set noise mode (0: usual noise, 1: 1-bit noise (PCM mode on wave channel))")}},
{0x76, {DIV_CMD_SID3_FILTER_OUTPUT_VOLUME, _("76xx: Set filter 1 output volume"), effectVal, constVal<0>}},
{0x77, {DIV_CMD_SID3_FILTER_OUTPUT_VOLUME, _("77xx: Set filter 2 output volume"), effectVal, constVal<1>}},
{0x78, {DIV_CMD_SID3_FILTER_OUTPUT_VOLUME, _("78xx: Set filter 3 output volume"), effectVal, constVal<2>}},
{0x79, {DIV_CMD_SID3_FILTER_OUTPUT_VOLUME, _("79xx: Set filter 4 output volume"), effectVal, constVal<3>}},
{0x7A, {DIV_CMD_SID3_FILTER_DISTORTION, _("7Axx: Set filter 1 distortion"), effectVal, constVal<0>}},
{0x7B, {DIV_CMD_SID3_FILTER_DISTORTION, _("7Bxx: Set filter 2 distortion"), effectVal, constVal<1>}},
{0x7C, {DIV_CMD_SID3_FILTER_DISTORTION, _("7Cxx: Set filter 3 distortion"), effectVal, constVal<2>}},
{0x7D, {DIV_CMD_SID3_FILTER_DISTORTION, _("7Dxx: Set filter 4 distortion"), effectVal, constVal<3>}},
{0x7E, {DIV_CMD_FM_FB, _("7Exx: Set feedback")}},
{0x7F, {DIV_CMD_SID3_CHANNEL_INVERSION, _("7Fxx: Set channel signal inversion (bit 0: right channel, bit 1: left channel)")}},
{0xA0, {DIV_CMD_C64_FILTER_MODE, _("A0xy: Set filter mode (x: filter (0-3); y: bit 0: low pass; bit 1: band pass; bit 2: high pass)")}},
{0xA1, {DIV_CMD_SID3_FILTER_CONNECTION, _("A1xy: Set filter connection (x: filter (0-3); y: bit 0: connect to channel input; bit 1: connect to channel output)")}},
{0xA2, {DIV_CMD_SID3_FILTER_MATRIX, _("A2xy: Set filter connection matrix (x: filter (0-3); y: bits 0-3: add filter 1-4 output to filter's input)")}},
{0xA3, {DIV_CMD_SID3_FILTER_ENABLE, _("A3xy: Enable filter (x: filter (0-3); y: enable)")}},
{0xA4, {DIV_CMD_C64_PW_SLIDE, _("A4xx: Pulse width slide up"), effectVal, constVal<1>}},
{0xA5, {DIV_CMD_C64_PW_SLIDE, _("A5xx: Pulse width slide down"), effectVal, constVal<-1>}},
{0xA6, {DIV_CMD_C64_CUTOFF_SLIDE, _("A6xx: Filter 1 cutoff slide up"), effectVal, constVal<1>}},
{0xA7, {DIV_CMD_C64_CUTOFF_SLIDE, _("A7xx: Filter 1 cutoff slide down"), effectVal, constVal<-1>}},
{0xA8, {DIV_CMD_C64_CUTOFF_SLIDE, _("A8xx: Filter 2 cutoff slide up"), effectVal, constVal<2>}},
{0xA9, {DIV_CMD_C64_CUTOFF_SLIDE, _("A9xx: Filter 2 cutoff slide down"), effectVal, constVal<-2>}},
{0xAA, {DIV_CMD_C64_CUTOFF_SLIDE, _("AAxx: Filter 3 cutoff slide up"), effectVal, constVal<3>}},
{0xAB, {DIV_CMD_C64_CUTOFF_SLIDE, _("ABxx: Filter 3 cutoff slide down"), effectVal, constVal<-3>}},
{0xAC, {DIV_CMD_C64_CUTOFF_SLIDE, _("ACxx: Filter 4 cutoff slide up"), effectVal, constVal<4>}},
{0xAD, {DIV_CMD_C64_CUTOFF_SLIDE, _("ADxx: Filter 4 cutoff slide down"), effectVal, constVal<-4>}},
{0xAE, {DIV_CMD_SID3_PHASE_RESET, _("AExx: Phase reset on tick xx")}},
{0xAF, {DIV_CMD_SID3_NOISE_PHASE_RESET, _("AFxx: Noise phase reset on tick xx")}},
{0xB0, {DIV_CMD_SID3_ENVELOPE_RESET, _("B0xx: Envelope reset on tick xx")}},
{0xB1, {DIV_CMD_SID3_CUTOFF_SCALING, _("B1xy: Cutoff scaling control (x: filter (0-3); y: bit 0: enable scaling; bit 1: invert scaling)")}},
{0xB2, {DIV_CMD_SID3_RESONANCE_SCALING, _("B2xy: Resonance scaling control (x: filter (0-3); y: bit 0: enable scaling; bit 1: invert scaling)")}},
};
const EffectHandler SID3FineDutyHandler(DIV_CMD_C64_FINE_DUTY, _("5xxx: Set pulse width (0 to FFF)"), effectValLong<12>);
const EffectHandler SID3FineCutoffHandler1(DIV_CMD_C64_FINE_CUTOFF, _("1xxx: Set cutoff of filter 1 (0 to FFF)"), effectValLong<12>, constVal<0>);
const EffectHandler SID3FineCutoffHandler2(DIV_CMD_C64_FINE_CUTOFF, _("2xxx: Set cutoff of filter 2 (0 to FFF)"), effectValLong<12>, constVal<1>);
const EffectHandler SID3FineCutoffHandler3(DIV_CMD_C64_FINE_CUTOFF, _("3xxx: Set cutoff of filter 3 (0 to FFF)"), effectValLong<12>, constVal<2>);
const EffectHandler SID3FineCutoffHandler4(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff of filter 4 (0 to FFF)"), effectValLong<12>, constVal<3>);
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x50+i,SID3FineDutyHandler);
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x10+i,SID3FineCutoffHandler1);
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x20+i,SID3FineCutoffHandler2);
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x30+i,SID3FineCutoffHandler3);
for (int i=0; i<16; i++) SID3PostEffectHandlerMap.emplace(0x40+i,SID3FineCutoffHandler4);
// SysDefs
// this chip uses YMZ ADPCM, but the emulator uses ADPCM-B because I got it wrong back then.
@ -1481,7 +1591,7 @@ void DivEngine::registerSystems() {
sysDefs[DIV_SYSTEM_OPLL_DRUMS]=new DivSysDef(
_("Yamaha YM2413 (OPLL) with drums"), NULL, 0xa7, 0, 11, true, false, 0x150, false, 0, 0, 0,
_("the OPLL chips but with drums mode turned on."),
_("the OPLL chip but with drums mode turned on."),
{_("FM 1"), _("FM 2"), _("FM 3"), _("FM 4"), _("FM 5"), _("FM 6"), _("Kick"), _("Snare"), _("Tom"), _("Top"), _("HiHat")},
{"F1", "F2", "F3", "F4", "F5", "F6", "BD", "SD", "TM", "TP", "HH"},
{DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE},
@ -1618,24 +1728,28 @@ void DivEngine::registerSystems() {
);
// to Grauw: feel free to change this to 24 during development of OPL4's PCM part.
// TODO: add 12-bit and 16-bit big-endian sample formats
sysDefs[DIV_SYSTEM_OPL4]=new DivSysDef(
_("Yamaha YMF278B (OPL4)"), NULL, 0xae, 0, 42, true, true, 0, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT), 0, 0,
_("Yamaha YMF278B (OPL4)"), NULL, 0xae, 0, 42, true, true, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_12BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT), 0, 0,
_("like OPL3, but this time it also has a 24-channel version of MultiPCM."),
{_("4OP 1"), _("FM 2"), _("4OP 3"), _("FM 4"), _("4OP 5"), _("FM 6"), _("4OP 7"), _("FM 8"), _("4OP 9"), _("FM 10"), _("4OP 11"), _("FM 12"), _("FM 13"), _("FM 14"), _("FM 15"), _("FM 16"), _("FM 17"), _("FM 18"), _("PCM 1"), _("PCM 2"), _("PCM 3"), _("PCM 4"), _("PCM 5"), _("PCM 6"), _("PCM 7"), _("PCM 8"), _("PCM 9"), _("PCM 10"), _("PCM 11"), _("PCM 12"), _("PCM 13"), _("PCM 14"), _("PCM 15"), _("PCM 16"), _("PCM 17"), _("PCM 18"), _("PCM 19"), _("PCM 20"), _("PCM 21"), _("PCM 22"), _("PCM 23"), _("PCM 24")},
{"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "P1", "P2", "P3", "P4", "P5", "P6", "P7", "P8", "P8", "P10", "P11", "P12", "P13", "P14", "P15", "P16", "P17", "P18", "P19", "P20", "P21", "P22", "P23", "P24"},
{"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "P1", "P2", "P3", "P4", "P5", "P6", "P7", "P8", "P9", "P10", "P11", "P12", "P13", "P14", "P15", "P16", "P17", "P18", "P19", "P20", "P21", "P22", "P23", "P24"},
{DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM},
{DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM}
{DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM},
{DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA},
fmEffectHandlerMap,
fmOPL4PostEffectHandlerMap
);
// TODO: same here
sysDefs[DIV_SYSTEM_OPL4_DRUMS]=new DivSysDef(
_("Yamaha YMF278B (OPL4) with drums"), NULL, 0xaf, 0, 44, true, true, 0, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT), 0, 0,
_("Yamaha YMF278B (OPL4) with drums"), NULL, 0xaf, 0, 44, true, true, 0x151, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_12BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT), 0, 0,
_("the OPL4 but with drums mode turned on."),
{_("4OP 1"), _("FM 2"), _("4OP 3"), _("FM 4"), _("4OP 5"), _("FM 6"), _("4OP 7"), _("FM 8"), _("4OP 9"), _("FM 10"), _("4OP 11"), _("FM 12"), _("FM 13"), _("FM 14"), _("FM 15"), _("Kick/FM 16"), _("Snare"), _("Tom"), _("Top"), _("HiHat"), _("PCM 1"), _("PCM 2"), _("PCM 3"), _("PCM 4"), _("PCM 5"), _("PCM 6"), _("PCM 7"), _("PCM 8"), _("PCM 9"), _("PCM 10"), _("PCM 11"), _("PCM 12"), _("PCM 13"), _("PCM 14"), _("PCM 15"), _("PCM 16"), _("PCM 17"), _("PCM 18"), _("PCM 19"), _("PCM 20"), _("PCM 21"), _("PCM 22"), _("PCM 23"), _("PCM 24")},
{"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "BD", "SD", "TM", "TP", "HH", "P1", "P2", "P3", "P4", "P5", "P6", "P7", "P8", "P8", "P10", "P11", "P12", "P13", "P14", "P15", "P16", "P17", "P18", "P19", "P20", "P21", "P22", "P23", "P24"},
{"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "BD", "SD", "TM", "TP", "HH", "P1", "P2", "P3", "P4", "P5", "P6", "P7", "P8", "P9", "P10", "P11", "P12", "P13", "P14", "P15", "P16", "P17", "P18", "P19", "P20", "P21", "P22", "P23", "P24"},
{DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_OP, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM, DIV_CH_PCM},
{DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM}
{DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM, DIV_INS_MULTIPCM},
{DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_OPL, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA},
fmOPLDrumsEffectHandlerMap,
fmOPL4PostEffectHandlerMap
);
EffectHandlerMap es5506PreEffectHandlerMap={
@ -1733,6 +1847,12 @@ void DivEngine::registerSystems() {
{0x20, {DIV_CMD_SU_SWEEP_ENABLE, _("20xx: Toggle frequency sweep (bit 0-6: speed; bit 7: direction is up)"), constVal<0>, effectVal}},
{0x21, {DIV_CMD_SU_SWEEP_ENABLE, _("21xx: Toggle volume sweep (bit 0-4: speed; bit 5: direction is up; bit 6: loop; bit 7: alternate)"), constVal<1>, effectVal}},
{0x22, {DIV_CMD_SU_SWEEP_ENABLE, _("22xx: Toggle cutoff sweep (bit 0-6: speed; bit 7: direction is up)"), constVal<2>, effectVal}},
{0x23, {DIV_CMD_C64_PW_SLIDE, _("23xx: Pulse width slide up"), effectVal, constVal<1>}},
{0x24, {DIV_CMD_C64_PW_SLIDE, _("24xx: Pulse width slide down"), effectVal, constVal<-1>}},
{0x25, {DIV_CMD_C64_CUTOFF_SLIDE, _("25xx: Filter cutoff slide up"), effectVal, constVal<1>}},
{0x26, {DIV_CMD_C64_CUTOFF_SLIDE, _("26xx: Filter cutoff slide down"), effectVal, constVal<-1>}},
};
const EffectHandler suCutoffHandler(DIV_CMD_C64_FINE_CUTOFF, _("4xxx: Set cutoff (0 to FFF)"), effectValLong<12>);
for (int i=0; i<16; i++) {
@ -1919,7 +2039,7 @@ void DivEngine::registerSystems() {
);
sysDefs[DIV_SYSTEM_SUPERVISION]=new DivSysDef(
_("Watara Supervision"), NULL, 0xe3, 0, 4, false, true, 0, false, 0, 0, 0,
_("Watara Supervision"), NULL, 0xe3, 0, 4, false, true, 0, false, 1U<<DIV_SAMPLE_DEPTH_8BIT, 0, 0,
_("a handheld that was trying to compete with the Game Boy, but it never succeded."),
{_("Pulse 1"), _("Pulse 2"), _("PCM"), _("Noise")},
{"S1", "S2", "PCM", "NO"},
@ -2175,6 +2295,18 @@ void DivEngine::registerSystems() {
SID2PostEffectHandlerMap
);
sysDefs[DIV_SYSTEM_SID3]=new DivSysDef(
_("SID3"), NULL, 0xf5, 0, 7, false, true, 0, false, (1U<<DIV_SAMPLE_DEPTH_8BIT)|(1U<<DIV_SAMPLE_DEPTH_16BIT), 256, 256,
_("a fantasy sound chip created by LTVA. it is a big rework of SID chip with probably too many features added on top."),
{_("Channel 1"), _("Channel 2"), _("Channel 3"), _("Channel 4"), _("Channel 5"), _("Channel 6"), _("Wave")},
{"CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "WA"},
{DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_WAVE},
{DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3, DIV_INS_SID3},
{},
{},
SID3PostEffectHandlerMap
);
sysDefs[DIV_SYSTEM_DUMMY]=new DivSysDef(
_("Dummy System"), NULL, 0xfd, 0, 8, false, true, 0, false, 0, 0, 0,
_("this is a system designed for testing purposes."),

124
src/engine/vgmOps.cpp
View file

@ -617,6 +617,96 @@ void DivEngine::performVGMWrite(SafeWriter* w, DivSystem sys, DivRegWrite& write
w->writeC(0);
}
break;
case DIV_SYSTEM_OPL4:
case DIV_SYSTEM_OPL4_DRUMS:
// disable envelope
for (int i=0; i<6; i++) {
w->writeC(0xd0);
w->writeC(0x00|baseAddr2);
w->writeC(0x80+i);
w->writeC(0x0f);
w->writeC(0xd0);
w->writeC(0x00|baseAddr2);
w->writeC(0x88+i);
w->writeC(0x0f);
w->writeC(0xd0);
w->writeC(0x00|baseAddr2);
w->writeC(0x90+i);
w->writeC(0x0f);
w->writeC(0xd0);
w->writeC(0x01|baseAddr2);
w->writeC(0x80+i);
w->writeC(0x0f);
w->writeC(0xd0);
w->writeC(0x01|baseAddr2);
w->writeC(0x88+i);
w->writeC(0x0f);
w->writeC(0xd0);
w->writeC(0x01|baseAddr2);
w->writeC(0x90+i);
w->writeC(0x0f);
}
for (int i=0; i<24; i++) {
w->writeC(0xd0);
w->writeC(0x02|baseAddr2);
w->writeC(0x80+i);
w->writeC(0x00);
w->writeC(0xd0);
w->writeC(0x02|baseAddr2);
w->writeC(0x98+i);
w->writeC(0x00);
w->writeC(0xd0);
w->writeC(0x02|baseAddr2);
w->writeC(0xb0+i);
w->writeC(0x00);
w->writeC(0xd0);
w->writeC(0x02|baseAddr2);
w->writeC(0xc8+i);
w->writeC(0x00);
w->writeC(0xd0);
w->writeC(0x02|baseAddr2);
w->writeC(0xe0+i);
w->writeC(0x00);
}
// key off + freq reset
for (int i=0; i<9; i++) {
w->writeC(0xd0);
w->writeC(0x00|baseAddr2);
w->writeC(0xa0+i);
w->writeC(0);
w->writeC(0xd0);
w->writeC(0x00|baseAddr2);
w->writeC(0xb0+i);
w->writeC(0);
w->writeC(0xd0);
w->writeC(0x01|baseAddr2);
w->writeC(0xa0+i);
w->writeC(0);
w->writeC(0xd0);
w->writeC(0x01|baseAddr2);
w->writeC(0xb0+i);
w->writeC(0);
}
for (int i=0; i<24; i++) {
w->writeC(0xd0);
w->writeC(0x02|baseAddr2);
w->writeC(0x20+i);
w->writeC(0);
w->writeC(0xd0);
w->writeC(0x02|baseAddr2);
w->writeC(0x38+i);
w->writeC(0);
w->writeC(0xd0);
w->writeC(0x02|baseAddr2);
w->writeC(0x68+i);
w->writeC(8);
}
// reset 4-op
w->writeC(0xd0);
w->writeC(0x01|baseAddr2);
w->writeC(0x04);
w->writeC(0x00);
break;
default:
break;
}
@ -1096,6 +1186,13 @@ void DivEngine::performVGMWrite(SafeWriter* w, DivSystem sys, DivRegWrite& write
w->writeS_BE(baseAddr2S|(write.addr&0x1ff));
w->writeC(write.val&0xff);
break;
case DIV_SYSTEM_OPL4:
case DIV_SYSTEM_OPL4_DRUMS:
w->writeC(0xd0);
w->writeC(((write.addr>>8)&0x7f)|baseAddr2);
w->writeC(write.addr&0xff);
w->writeC(write.val);
break;
default:
logW("write not handled!");
break;
@ -1276,6 +1373,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
DivDispatch* writeC140[2]={NULL,NULL};
DivDispatch* writeC219[2]={NULL,NULL};
DivDispatch* writeNES[2]={NULL,NULL};
DivDispatch* writePCM_OPL4[2]={NULL,NULL};
int writeNESIndex[2]={0,0};
@ -1874,6 +1972,22 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
howManyChips++;
}
break;
case DIV_SYSTEM_OPL4:
case DIV_SYSTEM_OPL4_DRUMS:
if (!hasOPL4) {
hasOPL4=disCont[i].dispatch->chipClock;
CHIP_VOL(13,1.0);
willExport[i]=true;
writePCM_OPL4[0]=disCont[i].dispatch;
} else if (!(hasOPL4&0x40000000)) {
isSecond[i]=true;
CHIP_VOL_SECOND(13,1.0);
willExport[i]=true;
writePCM_OPL4[1]=disCont[i].dispatch;
hasOPL4|=0x40000000;
howManyChips++;
}
break;
default:
break;
}
@ -2209,6 +2323,16 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
w->write(sampleMem,sampleMemLen);
delete[] sampleMem;
}
// PCM (OPL4)
if (writePCM_OPL4[i]!=NULL && writePCM_OPL4[i]->getSampleMemUsage(0)>0) {
w->writeC(0x67);
w->writeC(0x66);
w->writeC(0x84);
w->writeI((writePCM_OPL4[i]->getSampleMemUsage(0)+8)|(i*0x80000000));
w->writeI(writePCM_OPL4[i]->getSampleMemCapacity(0));
w->writeI(0);
w->write(writePCM_OPL4[i]->getSampleMem(0),writePCM_OPL4[i]->getSampleMemUsage(0));
}
}
for (int i=0; i<2; i++) {

13
src/gui/about.cpp
View file

@ -300,6 +300,9 @@ const char* aboutLine[]={
_N("PowerNoise emulator by scratchminer"),
_N("ep128emu by Istvan Varga"),
_N("NDS sound emulator by cam900"),
_N("openMSX YMF278 emulator (modified version) by the openMSX developers"),
_N("SID2 emulator by LTVA (modification of reSID emulator)"),
_N("SID3 emulator by LTVA"),
"",
_N("greetings to:"),
"floxy!",
@ -343,14 +346,8 @@ void FurnaceGUI::drawAbout() {
float r=0;
float g=0;
float b=0;
float peakMix=settings.partyTime?0:0.3;
if (settings.partyTime) {
for (int j=0; j<e->getAudioDescGot().outChans; j++) {
peakMix+=peak[j];
}
peakMix/=e->getAudioDescGot().outChans;
}
ImGui::ColorConvertHSVtoRGB(aboutHue,1.0,0.25+MIN(0.75f,peakMix*0.75f),r,g,b);
float peakMix=0.3;
ImGui::ColorConvertHSVtoRGB(aboutHue,1.0,0.475,r,g,b);
dl->AddRectFilled(ImVec2(0,0),ImVec2(canvasW,canvasH),0xff000000);
bool skip=false;
bool skip2=false;

2551
src/gui/font_furicon.cpp
View file

File diff suppressed because it is too large Load diff

15
src/gui/gui.cpp
View file

@ -425,6 +425,21 @@ void FurnaceGUI::decodeMMLStr(String& source, int* macro, unsigned char& macroLe
} \
}
bool FurnaceGUI::isCtrlWheelModifierHeld() const {
switch (settings.ctrlWheelModifier) {
case 0:
return ImGui::IsKeyDown(ImGuiMod_Ctrl) || ImGui::IsKeyDown(ImGuiMod_Super);
case 1:
return ImGui::IsKeyDown(ImGuiMod_Ctrl);
case 2:
return ImGui::IsKeyDown(ImGuiMod_Super);
case 3:
return ImGui::IsKeyDown(ImGuiMod_Alt);
default:
return false;
}
}
bool FurnaceGUI::CWSliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format, ImGuiSliderFlags flags) {
flags^=ImGuiSliderFlags_AlwaysClamp;
if (ImGui::SliderScalar(label,data_type,p_data,p_min,p_max,format,flags)) {

21
src/gui/gui.h
View file

@ -39,7 +39,7 @@
#define FURNACE_APP_ID "org.tildearrow.furnace"
#define rightClickable if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) ImGui::SetKeyboardFocusHere(-1);
#define ctrlWheeling ((ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl)) && wheelY!=0)
#define ctrlWheeling (isCtrlWheelModifierHeld() && wheelY!=0)
#define handleUnimportant if (settings.insFocusesPattern && patternOpen) {nextWindow=GUI_WINDOW_PATTERN;}
#define unimportant(x) if (x) {handleUnimportant}
@ -70,6 +70,9 @@
#define FM_PREVIEW_SIZE 512
#define CHECK_HIDDEN_SYSTEM(x) \
(x==DIV_SYSTEM_YMU759 || x==DIV_SYSTEM_UPD1771C || x==DIV_SYSTEM_DUMMY || x==DIV_SYSTEM_SEGAPCM_COMPAT || x==DIV_SYSTEM_PONG)
enum FurnaceGUIRenderBackend {
GUI_BACKEND_SDL=0,
GUI_BACKEND_GL3,
@ -356,6 +359,7 @@ enum FurnaceGUIColors {
GUI_COLOR_INSTR_SID2,
GUI_COLOR_INSTR_SUPERVISION,
GUI_COLOR_INSTR_UPD1771C,
GUI_COLOR_INSTR_SID3,
GUI_COLOR_INSTR_UNKNOWN,
GUI_COLOR_CHANNEL_BG,
@ -1772,6 +1776,7 @@ class FurnaceGUI {
int opnbCore;
int opl2Core;
int opl3Core;
int opl4Core;
int esfmCore;
int opllCore;
int ayCore;
@ -1798,6 +1803,7 @@ class FurnaceGUI {
int opnbCoreRender;
int opl2CoreRender;
int opl3CoreRender;
int opl4CoreRender;
int esfmCoreRender;
int opllCoreRender;
int ayCoreRender;
@ -1824,6 +1830,7 @@ class FurnaceGUI {
int patRowsBase;
int orderRowsBase;
int soloAction;
int ctrlWheelModifier;
int pullDeleteBehavior;
int wrapHorizontal;
int wrapVertical;
@ -1832,7 +1839,6 @@ class FurnaceGUI {
int allowEditDocking;
int chipNames;
int overflowHighlight;
int partyTime;
int flatNotes;
int germanNotation;
int stepOnDelete;
@ -2032,6 +2038,7 @@ class FurnaceGUI {
opnbCore(1),
opl2Core(0),
opl3Core(0),
opl4Core(0),
esfmCore(0),
opllCore(0),
ayCore(0),
@ -2058,6 +2065,7 @@ class FurnaceGUI {
opnbCoreRender(1),
opl2CoreRender(0),
opl3CoreRender(0),
opl4CoreRender(0),
esfmCoreRender(0),
opllCoreRender(0),
ayCoreRender(0),
@ -2083,6 +2091,7 @@ class FurnaceGUI {
patRowsBase(0),
orderRowsBase(1),
soloAction(0),
ctrlWheelModifier(0),
pullDeleteBehavior(1),
wrapHorizontal(0),
wrapVertical(0),
@ -2091,7 +2100,6 @@ class FurnaceGUI {
allowEditDocking(1),
chipNames(0),
overflowHighlight(0),
partyTime(0),
germanNotation(0),
stepOnDelete(0),
scrollStep(0),
@ -2230,7 +2238,7 @@ class FurnaceGUI {
vsync(1),
frameRateLimit(60),
displayRenderTime(0),
inputRepeat(0),
inputRepeat(1),
glRedSize(8),
glGreenSize(8),
glBlueSize(8),
@ -2741,9 +2749,11 @@ class FurnaceGUI {
void drawSSGEnv(unsigned char type, const ImVec2& size);
void drawWaveform(unsigned char type, bool opz, const ImVec2& size);
void drawWaveformSID3(unsigned char type, const ImVec2& size);
void drawAlgorithm(unsigned char alg, FurnaceGUIFMAlgs algType, const ImVec2& size);
void drawESFMAlgorithm(DivInstrumentESFM& esfm, const ImVec2& size);
void drawFMEnv(unsigned char tl, unsigned char ar, unsigned char dr, unsigned char d2r, unsigned char rr, unsigned char sl, unsigned char sus, unsigned char egt, unsigned char algOrGlobalSus, float maxTl, float maxArDr, float maxRr, const ImVec2& size, unsigned short instType);
void drawSID3Env(unsigned char tl, unsigned char ar, unsigned char dr, unsigned char d2r, unsigned char rr, unsigned char sl, unsigned char sus, unsigned char egt, unsigned char algOrGlobalSus, float maxTl, float maxArDr, float maxRr, const ImVec2& size, unsigned short instType);
void drawGBEnv(unsigned char vol, unsigned char len, unsigned char sLen, bool dir, const ImVec2& size);
bool drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& flags, bool modifyOnChange, bool fromMenu=false);
void kvsConfig(DivInstrument* ins, bool supportsKVS=true);
@ -2760,6 +2770,7 @@ class FurnaceGUI {
static bool LocalizedComboGetter(void* data, int idx, const char** out_text);
// these ones offer ctrl-wheel fine value changes.
bool isCtrlWheelModifierHeld() const;
bool CWSliderScalar(const char* label, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format=NULL, ImGuiSliderFlags flags=0);
bool CWVSliderScalar(const char* label, const ImVec2& size, ImGuiDataType data_type, void* p_data, const void* p_min, const void* p_max, const char* format=NULL, ImGuiSliderFlags flags=0);
bool CWSliderInt(const char* label, int* v, int v_min, int v_max, const char* format="%d", ImGuiSliderFlags flags=0);
@ -2806,6 +2817,7 @@ class FurnaceGUI {
void insTabFMModernHeader(DivInstrument* ins);
void insTabFM(DivInstrument* ins);
void insTabWavetable(DivInstrument* ins);
void insTabSample(DivInstrument* ins);
void drawOrderButtons();
@ -2842,6 +2854,7 @@ class FurnaceGUI {
void drawPattern();
void drawInsList(bool asChild=false);
void drawInsEdit();
void drawInsSID3(DivInstrument* ins);
void drawWaveList(bool asChild=false);
void drawWaveEdit();
void drawSampleList(bool asChild=false);

114
src/gui/guiConst.cpp
View file

@ -186,6 +186,7 @@ const char* insTypes[DIV_INS_MAX+1][3]={
{"SID2",ICON_FA_KEYBOARD_O,ICON_FUR_INS_SID2},
{"Watara Supervision",ICON_FA_GAMEPAD,ICON_FUR_INS_SUPERVISION},
{"NEC μPD1771C",ICON_FA_BAR_CHART,ICON_FUR_INS_UPD1771C},
{"SID3",ICON_FA_KEYBOARD_O,ICON_FUR_INS_SID3},
{NULL,ICON_FA_QUESTION,ICON_FA_QUESTION}
};
@ -210,7 +211,7 @@ const char* sampleDepths[DIV_SAMPLE_DEPTH_MAX]={
"8-bit µ-law PCM",
"C219 PCM",
"IMA ADPCM",
NULL,
"12-bit PCM",
NULL,
"16-bit PCM"
};
@ -346,40 +347,40 @@ const FurnaceGUIColors fxColors[256]={
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
// 60-6F
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
// 70-7F
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
// 80-8F
GUI_COLOR_PATTERN_EFFECT_PANNING,
@ -418,27 +419,27 @@ const FurnaceGUIColors fxColors[256]={
GUI_COLOR_PATTERN_EFFECT_MISC,
// A0-AF
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
// B0-BF
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
GUI_COLOR_PATTERN_EFFECT_INVALID,
@ -1022,6 +1023,7 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
D(GUI_COLOR_INSTR_SID2,"",ImVec4(0.6f,0.75f,1.0f,1.0f)),
D(GUI_COLOR_INSTR_SUPERVISION,"",ImVec4(0.52f,1.0f,0.6f,1.0f)),
D(GUI_COLOR_INSTR_UPD1771C,"",ImVec4(0.94f,0.52f,0.6f,1.0f)),
D(GUI_COLOR_INSTR_SID3,"",ImVec4(0.6f,0.75f,0.6f,1.0f)),
D(GUI_COLOR_INSTR_UNKNOWN,"",ImVec4(0.3f,0.3f,0.3f,1.0f)),
D(GUI_COLOR_CHANNEL_BG,"",ImVec4(0.4f,0.6f,0.8f,1.0f)),
@ -1270,8 +1272,11 @@ const int availableSystems[]={
DIV_SYSTEM_5E01,
DIV_SYSTEM_BIFURCATOR,
DIV_SYSTEM_SID2,
DIV_SYSTEM_OPL4,
DIV_SYSTEM_OPL4_DRUMS,
DIV_SYSTEM_SUPERVISION,
DIV_SYSTEM_UPD1771C,
DIV_SYSTEM_SID3,
0 // don't remove this last one!
};
@ -1307,6 +1312,8 @@ const int chipsFM[]={
DIV_SYSTEM_OPL3_DRUMS,
DIV_SYSTEM_OPZ,
DIV_SYSTEM_ESFM,
DIV_SYSTEM_OPL4,
DIV_SYSTEM_OPL4_DRUMS,
0 // don't remove this last one!
};
@ -1369,6 +1376,7 @@ const int chipsSpecial[]={
DIV_SYSTEM_SID2,
DIV_SYSTEM_SUPERVISION,
DIV_SYSTEM_UPD1771C,
DIV_SYSTEM_SID3,
0 // don't remove this last one!
};
@ -1394,6 +1402,8 @@ const int chipsSample[]={
DIV_SYSTEM_NDS,
DIV_SYSTEM_GBA_DMA,
DIV_SYSTEM_GBA_MINMOD,
DIV_SYSTEM_OPL4,
DIV_SYSTEM_OPL4_DRUMS,
0 // don't remove this last one!
};

1477
src/gui/insEdit.cpp
View file

File diff suppressed because it is too large Load diff

1
src/gui/intConst.cpp
View file

@ -33,6 +33,7 @@ const int _THIRTY_ONE=31;
const int _SIXTY_FOUR=64;
const int _ONE_HUNDRED=100;
const int _ONE_HUNDRED_TWENTY_SEVEN=127;
const int _ONE_HUNDRED_SEVENTY_NINE=179;
const int _TWO_HUNDRED_FIFTY_FIVE=255;
const int _FIVE_HUNDRED_ELEVEN=511;
const int _TWO_THOUSAND_FORTY_SEVEN=2047;

1
src/gui/intConst.h
View file

@ -35,6 +35,7 @@ extern const int _THIRTY_ONE;
extern const int _SIXTY_FOUR;
extern const int _ONE_HUNDRED;
extern const int _ONE_HUNDRED_TWENTY_SEVEN;
extern const int _ONE_HUNDRED_SEVENTY_NINE;
extern const int _TWO_HUNDRED_FIFTY_FIVE;
extern const int _FIVE_HUNDRED_ELEVEN;
extern const int _TWO_THOUSAND_FORTY_SEVEN;

4
src/gui/newSong.cpp
View file

@ -37,7 +37,7 @@ void FurnaceGUI::drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& acce
ImGui::TableNextColumn();
if (!i.subDefs.empty()) {
if (i.orig.empty()) {
sysDefID=fmt::sprintf("%s%s/%dS",i.name,sysDefIDLeader,index);
sysDefID=fmt::sprintf("%s%s/%dS",_(i.name.c_str()),sysDefIDLeader,index);
} else {
sysDefID=fmt::sprintf("%s/%dS",sysDefIDLeader,index);
}
@ -45,7 +45,7 @@ void FurnaceGUI::drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& acce
ImGui::SameLine();
}
if (!i.orig.empty()) {
sysDefID=fmt::sprintf("%s%s/%d",i.name,sysDefIDLeader,index);
sysDefID=fmt::sprintf("%s%s/%d",_(i.name.c_str()),sysDefIDLeader,index);
if (ImGui::Selectable(sysDefID.c_str(),false,ImGuiSelectableFlags_DontClosePopups)) {
nextDesc=i.definition;
nextDescName=i.name;

22
src/gui/pattern.cpp
View file

@ -1282,6 +1282,10 @@ void FurnaceGUI::drawPattern() {
memset(floors,0,4*4*sizeof(unsigned int));
for (int i=0; i<chans; i++) {
std::vector<DivChannelPair> pairs;
e->getChanPaired(i,pairs);
for (DivChannelPair pair: pairs) {
bool isPaired=false;
int numPairs=0;
unsigned int pairMin=i;
@ -1291,10 +1295,9 @@ void FurnaceGUI::drawPattern() {
continue;
}
DivChannelPair pairs=e->getChanPaired(i);
for (int j=0; j<8; j++) {
if (pairs.pairs[j]==-1) continue;
int pairCh=e->dispatchFirstChan[i]+pairs.pairs[j];
if (pair.pairs[j]==-1) continue;
int pairCh=e->dispatchFirstChan[i]+pair.pairs[j];
if (!e->curSubSong->chanShow[pairCh]) {
continue;
}
@ -1333,10 +1336,10 @@ void FurnaceGUI::drawPattern() {
posMax=pos;
numPairs++;
if (pairs.label==NULL) {
if (pair.label==NULL) {
textSize=ImGui::CalcTextSize("???");
} else {
textSize=ImGui::CalcTextSize(pairs.label);
textSize=ImGui::CalcTextSize(pair.label);
}
posY+=(textSize.y+ImGui::GetStyle().ItemSpacing.y)*curFloor;
@ -1349,8 +1352,8 @@ void FurnaceGUI::drawPattern() {
);
for (int j=0; j<8; j++) {
if (pairs.pairs[j]==-1) continue;
int pairCh=e->dispatchFirstChan[i]+pairs.pairs[j];
if (pair.pairs[j]==-1) continue;
int pairCh=e->dispatchFirstChan[i]+pair.pairs[j];
if (!e->curSubSong->chanShow[pairCh]) {
continue;
}
@ -1370,7 +1373,7 @@ void FurnaceGUI::drawPattern() {
posCenter/=numPairs;
if (pairs.label==NULL) {
if (pair.label==NULL) {
tdl->AddLine(
ImVec2(posMin,posY+textSize.y),
ImVec2(posMax,posY+textSize.y),
@ -1391,7 +1394,8 @@ void FurnaceGUI::drawPattern() {
2.0f*dpiScale
);
delayedLabels.push_back(DelayedLabel(posCenter,posY,textSize,pairs.label));
delayedLabels.push_back(DelayedLabel(posCenter,posY,textSize,pair.label));
}
}
}

18
src/gui/plot_nolerp.cpp
View file

@ -185,7 +185,7 @@ void PlotNoLerp(const char* label, const float* values, int values_count, int va
PlotNoLerpEx(ImGuiPlotType_Lines, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
}
int PlotBitfieldEx(const char* label, int (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char** overlay_text, int bits, ImVec2 frame_size, const bool* values_highlight, ImVec4 highlightColor, ImVec4 color)
int PlotBitfieldEx(const char* label, int (*values_getter)(void* data, int idx), void* data, int values_count, int values_offset, const char** overlay_text, int bits, ImVec2 frame_size, const bool* values_highlight, ImVec4 highlightColor, ImVec4 color, std::string (*hoverFunc)(int,float,void*), void* hoverFuncUser)
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = ImGui::GetCurrentWindow();
@ -225,8 +225,18 @@ int PlotBitfieldEx(const char* label, int (*values_getter)(void* data, int idx),
const int v_idx = (int)(t * item_count);
IM_ASSERT(v_idx >= 0 && v_idx < values_count);
//const float v0 = values_getter(data, (v_idx + values_offset) % values_count);
const float v0 = values_getter(data, (v_idx + values_offset) % values_count);
//ImGui::SetTooltip("%d: %8.4g", v_idx, v0);
if (hoverFunc) {
std::string hoverText=hoverFunc(v_idx,v0,hoverFuncUser);
if (!hoverText.empty()) {
ImGui::SetTooltip("%s",hoverText.c_str());
}
} else {
ImGui::SetTooltip("%d: %d (%X)", v_idx, (int)v0, (int)v0);
}
idx_hovered = v_idx;
}
@ -290,10 +300,10 @@ int PlotBitfieldEx(const char* label, int (*values_getter)(void* data, int idx),
return idx_hovered;
}
void PlotBitfield(const char* label, const int* values, int values_count, int values_offset, const char** overlay_text, int bits, ImVec2 graph_size, int stride, const bool* values_highlight, ImVec4 highlightColor, ImVec4 color)
void PlotBitfield(const char* label, const int* values, int values_count, int values_offset, const char** overlay_text, int bits, ImVec2 graph_size, int stride, const bool* values_highlight, ImVec4 highlightColor, ImVec4 color, std::string (*hoverFunc)(int,float,void*), void* hoverFuncUser)
{
FurnacePlotIntArrayGetterData data(values, stride);
PlotBitfieldEx(label, &Plot_IntArrayGetter, (void*)&data, values_count, values_offset, overlay_text, bits, graph_size, values_highlight, highlightColor, color);
PlotBitfieldEx(label, &Plot_IntArrayGetter, (void*)&data, values_count, values_offset, overlay_text, bits, graph_size, values_highlight, highlightColor, color, hoverFunc, hoverFuncUser);
}
int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_display_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float,void*), void* hoverFuncUser, bool blockMode, std::string (*guideFunc)(float), const bool* values_highlight, ImVec4 highlightColor)

2
src/gui/plot_nolerp.h
View file

@ -21,5 +21,5 @@
#include "../pch.h"
void PlotNoLerp(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
void PlotBitfield(const char* label, const int* values, int values_count, int values_offset = 0, const char** overlay_text = NULL, int bits = 8, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f), ImVec4 color = ImVec4(1.0f,1.0f,1.0f,1.0f));
void PlotBitfield(const char* label, const int* values, int values_count, int values_offset = 0, const char** overlay_text = NULL, int bits = 8, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f), ImVec4 color = ImVec4(1.0f,1.0f,1.0f,1.0f), std::string (*hoverFunc)(int,float,void*) = NULL, void* hoverFuncUser = NULL);
void PlotCustom(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), ImVec4 fgColor = ImVec4(1.0f,1.0f,1.0f,1.0f), int highlight = 0, std::string (*hoverFunc)(int,float,void*) = NULL, void* hoverFuncUser=NULL, bool blockMode=false, std::string (*guideFunc)(float) = NULL, const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f));

1036
src/gui/presets.cpp
View file

File diff suppressed because it is too large Load diff

6
src/gui/sampleEdit.cpp
View file

@ -413,6 +413,12 @@ void FurnaceGUI::drawSampleEdit() {
SAMPLE_WARN(warnLength,_("GBA DMA: sample length will be padded to multiple of 16"));
}
break;
case DIV_SYSTEM_OPL4:
case DIV_SYSTEM_OPL4_DRUMS:
if (sample->samples>65535) {
SAMPLE_WARN(warnLength,_("OPL4: maximum sample length is 65535"));
}
break;
case DIV_SYSTEM_SUPERVISION:
if (sample->loop) {
if (sample->loopStart!=0 || sample->loopEnd!=(int)(sample->samples)) {

72
src/gui/settings.cpp
View file

@ -83,7 +83,7 @@ const char* locales[][3]={
//{"Nederlands (4%)", "nl_NL", "start Furnace opnieuw op om deze instelling effectief te maken."},
{"Polski (95%)", "pl_PL", "aby to ustawienie było skuteczne, należy ponownie uruchomić program."},
{"Português (Brasil) (90%)", "pt_BR", "reinicie o Furnace para que essa configuração entre em vigor."},
{"Русский (90%)", "ru_RU", "перезапустите программу, чтобы эта настройка вступила в силу."},
{"Русский", "ru_RU", "перезапустите программу, чтобы эта настройка вступила в силу."},
{"Slovenčina (15%)", "sk_SK", "???"},
{"Svenska", "sv_SE", "starta om programmet för att denna inställning ska träda i kraft."},
//{"ไทย (0%)", "th_TH", "???"},
@ -189,6 +189,11 @@ const char* opl3Cores[]={
"YMF262-LLE"
};
const char* opl4Cores[]={
"Nuked-OPL3 (FM) + openMSX (PCM)",
"ymfm"
};
const char* esfmCores[]={
"ESFMu",
_N("ESFMu (fast)")
@ -1003,7 +1008,11 @@ void FurnaceGUI::drawSettings() {
for (totalAvailSys=0; availableSystems[totalAvailSys]; totalAvailSys++);
if (totalAvailSys>0) {
for (int i=0; i<howMany; i++) {
settings.initialSys.set(fmt::sprintf("id%d",i),e->systemToFileFur((DivSystem)availableSystems[rand()%totalAvailSys]));
DivSystem theSystem=DIV_SYSTEM_DUMMY;
do {
theSystem=(DivSystem)availableSystems[rand()%totalAvailSys];
} while (!settings.hiddenSystems && CHECK_HIDDEN_SYSTEM(theSystem));
settings.initialSys.set(fmt::sprintf("id%d",i),e->systemToFileFur(theSystem));
settings.initialSys.set(fmt::sprintf("vol%d",i),1.0f);
settings.initialSys.set(fmt::sprintf("pan%d",i),0.0f);
settings.initialSys.set(fmt::sprintf("fr%d",i),0.0f);
@ -1226,15 +1235,6 @@ void FurnaceGUI::drawSettings() {
settingsChanged=true;
}
bool partyTimeB=settings.partyTime;
if (ImGui::Checkbox(_("About screen party time"),&partyTimeB)) {
settings.partyTime=partyTimeB;
settingsChanged=true;
}
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip(_("Warning: may cause epileptic seizures."));
}
// SUBSECTION BEHAVIOR
CONFIG_SUBSECTION(_("Behavior"));
bool blankInsB=settings.blankIns;
@ -2058,6 +2058,17 @@ void FurnaceGUI::drawSettings() {
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (ImGui::Combo("##OPL3CoreRender",&settings.opl3CoreRender,opl3Cores,3)) settingsChanged=true;
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("OPL4");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (ImGui::Combo("##OPL4Core",&settings.opl4Core,opl4Cores,2)) settingsChanged=true;
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (ImGui::Combo("##OPL4CoreRender",&settings.opl4CoreRender,opl4Cores,2)) settingsChanged=true;
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
@ -2137,7 +2148,6 @@ void FurnaceGUI::drawSettings() {
ImGui::SameLine();
if (ImGui::Combo("##PCSOutMethod",&settings.pcSpeakerOutMethod,LocalizedComboGetter,pcspkrOutMethods,5)) settingsChanged=true;
/*
ImGui::Separator();
ImGui::Text(_("Sample ROMs:"));
@ -2150,6 +2160,7 @@ void FurnaceGUI::drawSettings() {
openFileDialog(GUI_FILE_YRW801_ROM_OPEN);
}
/*
ImGui::AlignTextToFramePadding();
ImGui::Text(_("MultiPCM TG100 path"));
ImGui::SameLine();
@ -2722,6 +2733,27 @@ void FurnaceGUI::drawSettings() {
}
ImGui::Unindent();
ImGui::Text(_("Modifier for alternate wheel-scrolling (vertical/zoom/slider-input):"));
ImGui::Indent();
if (ImGui::RadioButton(_("Ctrl or Meta/Cmd##cwm1"),settings.ctrlWheelModifier==0)) {
settings.ctrlWheelModifier=0;
settingsChanged=true;
}
if (ImGui::RadioButton(_("Ctrl##cwm2"),settings.ctrlWheelModifier==1)) {
settings.ctrlWheelModifier=1;
settingsChanged=true;
}
if (ImGui::RadioButton(_("Meta/Cmd##cwm3"),settings.ctrlWheelModifier==2)) {
settings.ctrlWheelModifier=2;
settingsChanged=true;
}
// technically this key is called Option on mac, but we call it Alt in getKeyName(s)
if (ImGui::RadioButton(_("Alt##cwm4"),settings.ctrlWheelModifier==3)) {
settings.ctrlWheelModifier=3;
settingsChanged=true;
}
ImGui::Unindent();
bool doubleClickColumnB=settings.doubleClickColumn;
if (ImGui::Checkbox(_("Double click selects entire column"),&doubleClickColumnB)) {
settings.doubleClickColumn=doubleClickColumnB;
@ -4130,6 +4162,7 @@ void FurnaceGUI::drawSettings() {
UI_COLOR_CONFIG(GUI_COLOR_INSTR_SID2,_("SID2"));
UI_COLOR_CONFIG(GUI_COLOR_INSTR_SUPERVISION,_("Supervision"));
UI_COLOR_CONFIG(GUI_COLOR_INSTR_UPD1771C,_("μPD1771C"));
UI_COLOR_CONFIG(GUI_COLOR_INSTR_SID3,_("SID3"));
UI_COLOR_CONFIG(GUI_COLOR_INSTR_UNKNOWN,_("Other/Unknown"));
ImGui::TreePop();
}
@ -4823,6 +4856,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
if (groups&GUI_SETTINGS_BEHAVIOR) {
settings.soloAction=conf.getInt("soloAction",0);
settings.ctrlWheelModifier=conf.getInt("ctrlWheelModifier",0);
settings.pullDeleteBehavior=conf.getInt("pullDeleteBehavior",1);
settings.wrapHorizontal=conf.getInt("wrapHorizontal",0);
settings.wrapVertical=conf.getInt("wrapVertical",0);
@ -4862,7 +4896,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
settings.selectAssetOnLoad=conf.getInt("selectAssetOnLoad",1);
settings.inputRepeat=conf.getInt("inputRepeat",0);
settings.inputRepeat=conf.getInt("inputRepeat",1);
}
if (groups&GUI_SETTINGS_FONT) {
@ -4920,7 +4954,6 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
settings.chipNames=conf.getInt("chipNames",0);
settings.overflowHighlight=conf.getInt("overflowHighlight",0);
settings.partyTime=conf.getInt("partyTime",0);
settings.flatNotes=conf.getInt("flatNotes",0);
settings.germanNotation=conf.getInt("germanNotation",0);
@ -5002,6 +5035,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
settings.opnbCore=conf.getInt("opnbCore",1);
settings.opl2Core=conf.getInt("opl2Core",0);
settings.opl3Core=conf.getInt("opl3Core",0);
settings.opl4Core=conf.getInt("opl4Core",0);
settings.esfmCore=conf.getInt("esfmCore",0);
settings.opllCore=conf.getInt("opllCore",0);
settings.ayCore=conf.getInt("ayCore",0);
@ -5030,6 +5064,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
settings.opnbCoreRender=conf.getInt("opnbCoreRender",1);
settings.opl2CoreRender=conf.getInt("opl2CoreRender",0);
settings.opl3CoreRender=conf.getInt("opl3CoreRender",0);
settings.opl4CoreRender=conf.getInt("opl4CoreRender",0);
settings.esfmCoreRender=conf.getInt("esfmCoreRender",0);
settings.opllCoreRender=conf.getInt("opllCoreRender",0);
settings.ayCoreRender=conf.getInt("ayCoreRender",0);
@ -5075,6 +5110,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
clampSetting(settings.opnbCore,0,2);
clampSetting(settings.opl2Core,0,2);
clampSetting(settings.opl3Core,0,2);
clampSetting(settings.opl4Core,0,1);
clampSetting(settings.esfmCore,0,1);
clampSetting(settings.opllCore,0,1);
clampSetting(settings.ayCore,0,1);
@ -5101,6 +5137,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
clampSetting(settings.opnbCoreRender,0,2);
clampSetting(settings.opl2CoreRender,0,2);
clampSetting(settings.opl3CoreRender,0,2);
clampSetting(settings.opl4CoreRender,0,1);
clampSetting(settings.esfmCoreRender,0,1);
clampSetting(settings.opllCoreRender,0,1);
clampSetting(settings.ayCoreRender,0,1);
@ -5121,6 +5158,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
clampSetting(settings.patRowsBase,0,1);
clampSetting(settings.orderRowsBase,0,1);
clampSetting(settings.soloAction,0,2);
clampSetting(settings.ctrlWheelModifier,0,3);
clampSetting(settings.pullDeleteBehavior,0,1);
clampSetting(settings.wrapHorizontal,0,2);
clampSetting(settings.wrapVertical,0,3);
@ -5128,7 +5166,6 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
clampSetting(settings.allowEditDocking,0,1);
clampSetting(settings.chipNames,0,1);
clampSetting(settings.overflowHighlight,0,1);
clampSetting(settings.partyTime,0,1);
clampSetting(settings.flatNotes,0,1);
clampSetting(settings.germanNotation,0,1);
clampSetting(settings.stepOnDelete,0,1);
@ -5408,6 +5445,7 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
// behavior
if (groups&GUI_SETTINGS_BEHAVIOR) {
conf.set("soloAction",settings.soloAction);
conf.set("ctrlWheelModifier",settings.ctrlWheelModifier);
conf.set("pullDeleteBehavior",settings.pullDeleteBehavior);
conf.set("wrapHorizontal",settings.wrapHorizontal);
conf.set("wrapVertical",settings.wrapVertical);
@ -5507,7 +5545,6 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
conf.set("chipNames",settings.chipNames);
conf.set("overflowHighlight",settings.overflowHighlight);
conf.set("partyTime",settings.partyTime);
conf.set("flatNotes",settings.flatNotes);
conf.set("germanNotation",settings.germanNotation);
@ -5591,6 +5628,7 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
conf.set("opnbCore",settings.opnbCore);
conf.set("opl2Core",settings.opl2Core);
conf.set("opl3Core",settings.opl3Core);
conf.set("opl4Core",settings.opl4Core);
conf.set("esfmCore",settings.esfmCore);
conf.set("opllCore",settings.opllCore);
conf.set("ayCore",settings.ayCore);
@ -5619,6 +5657,7 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
conf.set("opnbCoreRender",settings.opnbCoreRender);
conf.set("opl2CoreRender",settings.opl2CoreRender);
conf.set("opl3CoreRender",settings.opl3CoreRender);
conf.set("opl4CoreRender",settings.opl4CoreRender);
conf.set("esfmCoreRender",settings.esfmCoreRender);
conf.set("opllCoreRender",settings.opllCoreRender);
conf.set("ayCoreRender",settings.ayCoreRender);
@ -5682,6 +5721,7 @@ void FurnaceGUI::commitSettings() {
settings.opnbCore!=e->getConfInt("opnbCore",1) ||
settings.opl2Core!=e->getConfInt("opl2Core",0) ||
settings.opl3Core!=e->getConfInt("opl3Core",0) ||
settings.opl4Core!=e->getConfInt("opl4Core",0) ||
settings.esfmCore!=e->getConfInt("esfmCore",0) ||
settings.opllCore!=e->getConfInt("opllCore",0) ||
settings.ayCore!=e->getConfInt("ayCore",0) ||

83
src/gui/sysConf.cpp
View file

@ -2543,6 +2543,67 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
}
break;
}
case DIV_SYSTEM_OPL4:
case DIV_SYSTEM_OPL4_DRUMS: {
int clockSel=flags.getInt("clockSel",0);
int ramSize=flags.getInt("ramSize",0);
ImGui::Text(_("Clock rate:"));
ImGui::Indent();
if (ImGui::RadioButton(_("33.8688MHz"),clockSel==0)) {
clockSel=0;
altered=true;
}
if (ImGui::RadioButton(_("28.64MHz (NTSC)"),clockSel==1)) {
clockSel=1;
altered=true;
}
if (ImGui::RadioButton(_("28.38MHz (PAL)"),clockSel==2)) {
clockSel=2;
altered=true;
}
ImGui::Unindent();
ImGui::Text(_("RAM size:"));
ImGui::Indent();
if (ImGui::RadioButton(_("4MB"),ramSize==0)) {
ramSize=0;
altered=true;
}
if (ImGui::RadioButton(_("2MB"),ramSize==1)) {
ramSize=1;
altered=true;
}
if (ImGui::RadioButton(_("1MB"),ramSize==2)) {
ramSize=2;
altered=true;
}
if (ImGui::RadioButton(_("640KB"),ramSize==3)) {
ramSize=3;
altered=true;
}
if (ImGui::RadioButton(_("512KB"),ramSize==4)) {
ramSize=4;
altered=true;
}
if (ImGui::RadioButton(_("256KB"),ramSize==5)) {
ramSize=5;
altered=true;
}
if (ImGui::RadioButton(_("128KB"),ramSize==6)) {
ramSize=6;
altered=true;
}
ImGui::Unindent();
if (altered) {
e->lockSave([&]() {
flags.set("clockSel",clockSel);
flags.set("ramSize",ramSize);
});
}
break;
}
case DIV_SYSTEM_SWAN:
case DIV_SYSTEM_BUBSYS_WSG:
case DIV_SYSTEM_PET:
@ -2558,6 +2619,28 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
supportsCustomRate=false;
ImGui::Text(_("nothing to configure"));
break;
case DIV_SYSTEM_SID3: {
bool quarterClock=flags.getBool("quarterClock",false);
if (ImGui::Checkbox(_("Quarter clock speed"),&quarterClock)) {
altered=true;
}
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip(_("Decreases clock speed and CPU audio load by 4 times.\nCan be used if your CPU is too slow for the chip."
"\nDoes not affect clock speed during export!\n\n"
"Warning! Filters may become unstable at high cutoff and resonance\nif this option or lower clock speed are used!\n"
"Also filters' timbre may be different near these values.\n\n"
"Default clock speed is 1MHz (1000000Hz)."));
}
if (altered) {
e->lockSave([&]() {
flags.set("quarterClock",(int)quarterClock);
});
}
break;
}
default: {
bool sysPal=flags.getInt("clockSel",0);

2
src/gui/sysPicker.cpp
View file

@ -65,6 +65,7 @@ DivSystem FurnaceGUI::systemPicker(bool fullWidth) {
if (sysSearchQuery.empty()) {
// display chip list
for (int j=0; curSysSection[j]; j++) {
if (!settings.hiddenSystems && CHECK_HIDDEN_SYSTEM(curSysSection[j])) continue;
ImGui::TableNextRow();
ImGui::TableNextColumn();
if (ImGui::Selectable(e->getSystemName((DivSystem)curSysSection[j]),false,0,ImVec2(500.0f*dpiScale,0.0f))) ret=(DivSystem)curSysSection[j];
@ -75,6 +76,7 @@ DivSystem FurnaceGUI::systemPicker(bool fullWidth) {
} else {
// display search results
for (DivSystem i: sysSearchResults) {
if (!settings.hiddenSystems && CHECK_HIDDEN_SYSTEM(i)) continue;
ImGui::TableNextRow();
ImGui::TableNextColumn();
if (ImGui::Selectable(e->getSystemName(i),false,0,ImVec2(500.0f*dpiScale,0.0f))) ret=i;

106
src/gui/util.cpp
View file

@ -112,3 +112,109 @@ String getKeyName(int key, bool emptyNone) {
}
return ret;
}
double sinus(double x) {
return sin(x);
}
double rectSin(double x) {
return sin(x) > 0 ? sin(x) : 0;
}
double absSin(double x) {
return fabs(sin(x));
}
double square(double x) {
return fmod(x, (2 * M_PI)) >= M_PI ? -1 : 1;
}
double rectSquare(double x) {
return square(x) > 0 ? square(x) : 0;
}
double quartSin(double x) {
return absSin(x) * rectSquare(2 * x);
}
double squiSin(double x) {
return sin(x) >= 0 ? sin(2 * x) : 0;
}
double squiAbsSin(double x) {
return fabs(squiSin(x));
}
double saw(double x) {
return atan(tan(x / 2)) / (M_PI / 2);
}
double rectSaw(double x) {
return saw(x) > 0 ? saw(x) : 0;
}
double absSaw(double x) {
return saw(x) < 0 ? saw(x) + 1 : saw(x);
}
double cubSaw(double x) {
return pow(saw(x), 3);
}
double rectCubSaw(double x) {
return pow(rectSaw(x), 3);
}
double absCubSaw(double x) {
return pow(absSaw(x), 3);
}
double cubSine(double x) {
return pow(sin(x), 3);
}
double rectCubSin(double x) {
return pow(rectSin(x), 3);
}
double absCubSin(double x) {
return pow(absSin(x), 3);
}
double quartCubSin(double x) {
return pow(quartSin(x), 3);
}
double squishCubSin(double x) {
return pow(squiSin(x), 3);
}
double squishAbsCubSin(double x) {
return pow(squiAbsSin(x), 3);
}
double triangle(double x) {
return asin(sin(x)) / (M_PI / 2);
}
double rectTri(double x) {
return triangle(x) > 0 ? triangle(x) : 0;
}
double absTri(double x) {
return fabs(triangle(x));
}
double quartTri(double x) {
return absTri(x) * rectSquare(2 * x);
}
double squiTri(double x) {
return sin(x) >= 0 ? triangle(2 * x) : 0;
}
double absSquiTri(double x) {
return fabs(squiTri(x));
}
double cubTriangle(double x) {
return pow(triangle(x), 3);
}
double cubRectTri(double x) {
return pow(rectTri(x), 3);
}
double cubAbsTri(double x) {
return pow(absTri(x), 3);
}
double cubQuartTri(double x) {
return pow(quartTri(x), 3);
}
double cubSquiTri(double x) {
return pow(squiTri(x), 3);
}
double absCubSquiTri(double x) {
return fabs(cubSquiTri(x));
}

33
src/gui/util.h
View file

@ -31,3 +31,36 @@
String getHomeDir();
String getKeyName(int key, bool emptyNone=false);
double sinus(double x);
double rectSin(double x);
double absSin(double x);
double square(double x);
double rectSquare(double x);
double quartSin(double x);
double squiSin(double x);
double squiAbsSin(double x);
double saw(double x);
double rectSaw(double x);
double absSaw(double x);
double cubSaw(double x);
double rectCubSaw(double x);
double absCubSaw(double x);
double cubSine(double x);
double rectCubSin(double x);
double absCubSin(double x);
double quartCubSin(double x);
double squishCubSin(double x);
double squishAbsCubSin(double x);
double triangle(double x);
double rectTri(double x);
double absTri(double x);
double quartTri(double x);
double squiTri(double x);
double absSquiTri(double x);
double cubTriangle(double x);
double cubRectTri(double x);
double cubAbsTri(double x);
double cubQuartTri(double x);
double cubSquiTri(double x);
double absCubSquiTri(double x);

123
src/gui/waveEdit.cpp
View file

@ -19,6 +19,7 @@
#define _USE_MATH_DEFINES
#include "gui.h"
#include "util.h"
#include "plot_nolerp.h"
#include "IconsFontAwesome4.h"
#include "misc/cpp/imgui_stdlib.h"
@ -40,111 +41,6 @@ const char* waveInterpolations[4]={
_N("Cubic")
};
double sinus(double x) {
return sin(x);
}
double rectSin(double x) {
return sin(x) > 0 ? sin(x) : 0;
}
double absSin(double x) {
return fabs(sin(x));
}
double square(double x) {
return fmod(x, (2 * M_PI)) >= M_PI ? -1 : 1;
}
double rectSquare(double x) {
return square(x) > 0 ? square(x) : 0;
}
double quartSin(double x) {
return absSin(x) * rectSquare(2 * x);
}
double squiSin(double x) {
return sin(x) >= 0 ? sin(2 * x) : 0;
}
double squiAbsSin(double x) {
return fabs(squiSin(x));
}
double saw(double x) {
return atan(tan(x / 2)) / (M_PI / 2);
}
double rectSaw(double x) {
return saw(x) > 0 ? saw(x) : 0;
}
double absSaw(double x) {
return saw(x) < 0 ? saw(x) + 1 : saw(x);
}
double cubSaw(double x) {
return pow(saw(x), 3);
}
double rectCubSaw(double x) {
return pow(rectSaw(x), 3);
}
double absCubSaw(double x) {
return pow(absSaw(x), 3);
}
double cubSine(double x) {
return pow(sin(x), 3);
}
double rectCubSin(double x) {
return pow(rectSin(x), 3);
}
double absCubSin(double x) {
return pow(absSin(x), 3);
}
double quartCubSin(double x) {
return pow(quartSin(x), 3);
}
double squishCubSin(double x) {
return pow(squiSin(x), 3);
}
double squishAbsCubSin(double x) {
return pow(squiAbsSin(x), 3);
}
double triangle(double x) {
return asin(sin(x)) / (M_PI / 2);
}
double rectTri(double x) {
return triangle(x) > 0 ? triangle(x) : 0;
}
double absTri(double x) {
return fabs(triangle(x));
}
double quartTri(double x) {
return absTri(x) * rectSquare(2 * x);
}
double squiTri(double x) {
return sin(x) >= 0 ? triangle(2 * x) : 0;
}
double absSquiTri(double x) {
return fabs(squiTri(x));
}
double cubTriangle(double x) {
return pow(triangle(x), 3);
}
double cubRectTri(double x) {
return pow(rectTri(x), 3);
}
double cubAbsTri(double x) {
return pow(absTri(x), 3);
}
double cubQuartTri(double x) {
return pow(quartTri(x), 3);
}
double cubSquiTri(double x) {
return pow(squiTri(x), 3);
}
double absCubSquiTri(double x) {
return fabs(cubSquiTri(x));
}
typedef double (*WaveFunc) (double a);
WaveFunc waveFuncs[]={
@ -495,7 +391,7 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextColumn();
ImGui::Text(_("Width"));
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip(_("use a width of:\n- any on Amiga/N163\n- 32 on Game Boy, PC Engine, SCC, Konami Bubble System, Namco WSG, Virtual Boy and WonderSwan\n- 64 on FDS\n- 128 on X1-010\nany other widths will be scaled during playback."));
ImGui::SetTooltip(_("use a width of:\n- any on Amiga/N163\n- 32 on Game Boy, PC Engine, SCC, Konami Bubble System, Namco WSG, Virtual Boy and WonderSwan\n- 64 on FDS\n- 128 on X1-010\n- 256 on SID3\nany other widths will be scaled during playback."));
}
ImGui::SameLine();
ImGui::SetNextItemWidth(96.0f*dpiScale);
@ -509,7 +405,7 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::SameLine();
ImGui::Text(_("Height"));
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip(_("use a height of:\n- 16 for Game Boy, WonderSwan, Namco WSG, Konami Bubble System, X1-010 Envelope shape and N163\n- 32 for PC Engine\n- 64 for FDS and Virtual Boy\n- 256 for X1-010 and SCC\nany other heights will be scaled during playback."));
ImGui::SetTooltip(_("use a height of:\n- 16 for Game Boy, WonderSwan, Namco WSG, Konami Bubble System, X1-010 Envelope shape and N163\n- 32 for PC Engine\n- 64 for FDS and Virtual Boy\n- 256 for X1-010, SCC and SID3\nany other heights will be scaled during playback."));
}
ImGui::SameLine();
ImGui::SetNextItemWidth(96.0f*dpiScale);
@ -947,6 +843,7 @@ void FurnaceGUI::drawWaveEdit() {
wave->len=waveGenScaleX;
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
ImGui::TableNextRow();
@ -965,6 +862,7 @@ void FurnaceGUI::drawWaveEdit() {
wave->max=waveGenScaleY-1;
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
ImGui::TableNextRow();
@ -987,6 +885,7 @@ void FurnaceGUI::drawWaveEdit() {
}
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
ImGui::TableNextRow();
@ -1004,6 +903,7 @@ void FurnaceGUI::drawWaveEdit() {
}
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
ImGui::TableNextRow();
@ -1030,6 +930,7 @@ void FurnaceGUI::drawWaveEdit() {
}
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
ImGui::TableNextRow();
@ -1049,6 +950,7 @@ void FurnaceGUI::drawWaveEdit() {
}
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
ImGui::EndTable();
@ -1092,6 +994,7 @@ void FurnaceGUI::drawWaveEdit() {
}
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
if (ImGui::Button(_("Invert"),buttonSizeHalf)) {
e->lockEngine([this,wave]() {
@ -1100,6 +1003,7 @@ void FurnaceGUI::drawWaveEdit() {
}
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
ImGui::SameLine();
if (ImGui::Button(_("Reverse"),buttonSizeHalf)) {
@ -1112,6 +1016,7 @@ void FurnaceGUI::drawWaveEdit() {
}
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
if (ImGui::Button(_("Half"),buttonSizeHalf)) {
@ -1121,6 +1026,7 @@ void FurnaceGUI::drawWaveEdit() {
for (int i=0; i<wave->len; i++) {
wave->data[i]=origData[i>>1];
}
e->notifyWaveChange(curWave);
MARK_MODIFIED;
}
ImGui::SameLine();
@ -1131,6 +1037,7 @@ void FurnaceGUI::drawWaveEdit() {
for (int i=0; i<wave->len; i++) {
wave->data[i]=origData[(i*2)%wave->len];
}
e->notifyWaveChange(curWave);
MARK_MODIFIED;
}
@ -1145,6 +1052,7 @@ void FurnaceGUI::drawWaveEdit() {
}
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
if (ImGui::Button(_("Randomize"),buttonSize)) {
if (wave->max>0) e->lockEngine([this,wave]() {
@ -1153,6 +1061,7 @@ void FurnaceGUI::drawWaveEdit() {
}
MARK_MODIFIED;
});
e->notifyWaveChange(curWave);
}
ImGui::EndTabItem();
}

3
src/icon/furIcons.h
View file

@ -1,7 +1,7 @@
// not auto-generated. update every time you change icons.ttf!
#define ICON_MIN_FUR 0xe0f0
#define ICON_MAX_FUR 0xe161
#define ICON_MAX_FUR 0xe164
// test
#define ICON_FUR_TEST0 u8"\ue0f0"
@ -77,6 +77,7 @@
#define ICON_FUR_INS_SID2 u8"\ue161"
#define ICON_FUR_INS_SUPERVISION u8"\ue162"
#define ICON_FUR_INS_UPD1771C u8"\ue163"
#define ICON_FUR_INS_SID3 u8"\ue164"
// sample editor
#define ICON_FUR_SAMPLE_APPLY_SILENCE u8"\ue136"

3
src/main.cpp
View file

@ -339,6 +339,9 @@ TAParamResult pVersion(String) {
printf("- PowerNoise emulator by scratchminer (MIT)\n");
printf("- ep128emu by Istvan Varga (GPLv2)\n");
printf("- NDS sound emulator by cam900 (zlib license)\n");
printf("- SID2 emulator by LTVA (GPLv2, modification of reSID emulator)\n");
printf("- SID3 emulator by LTVA (MIT)\n");
printf("- openMSX YMF278 emulator (modified version) by the openMSX developers (GPLv2)\n");
return TA_PARAM_QUIT;
}