Skip to content

Support for alternative tunings and keyboard mappings #5522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DomClark merged 80 commits into from
Sep 9, 2021
Merged

Support for alternative tunings and keyboard mappings #5522

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
7e55bfb
Extend LMMS note range to match MIDI specification (fixes #1857)
he29-net Dec 17, 2019
67fc3a6
Update src/core/midi/MidiClient.cpp
he29-net Dec 19, 2019
8319133
Apply suggestions from code review
he29-net Dec 19, 2019
3dea4b9
Formatting changes
he29-net Dec 19, 2019
9dc7985
Remove useless Note.h includes, fix basenote and octave offsets in Hy…
he29-net Dec 19, 2019
1e35331
Migrate all presets to new basenote; remove offset from OpulenZ
he29-net Dec 20, 2019
d5b94f8
Implement upgrade routine for affected instruments; replace c-style c…
he29-net Dec 20, 2019
a2aebb5
WIP, initial GUI mockup
he29-net Dec 21, 2019
8aea594
Basic Microtuner skeleton; implement note boundary settings and checks
he29-net Dec 23, 2019
f499328
Draw disabled PianoView keys with lower contrast; WIP the same for Pi…
he29-net Dec 23, 2019
4778b8e
Finish range grey-out for PianoRoll after rebase
he29-net Dec 24, 2019
0255e6d
Checkpoint before nuking the in-instrument scale setup widgets
he29-net Dec 25, 2019
bc61c89
Erradicate BaseFreq, get a basic frequency retuning working.
he29-net Dec 25, 2019
d979313
WIP, repo sync
he29-net Dec 28, 2019
36dcb3e
Checkpoint before nuking WIP interpolating note detune
he29-net Jan 4, 2020
3906d6d
Key to frequency translation working, native instruments can use pre-…
he29-net Jan 4, 2020
2c95fbe
Remove scale / keymap editor from instrument window; add a project-wi…
he29-net May 8, 2020
d692376
WIP before potentially nuking the LUT approach; working Scale→freq ta…
he29-net May 10, 2020
418174e
Moved from LUT approach to on-demand frequency calculation, added bas…
he29-net May 19, 2020
d668090
Keyboard mapping probably kinda working
he29-net May 24, 2020
233d37e
Validation of user entered scale and keymap data
he29-net May 24, 2020
52f066a
Draft of LcdFloatSpinBox; range spinboxes connected to dummy models
he29-net May 25, 2020
d5eb119
Finish LcdFloatSpinBox
he29-net May 26, 2020
f5a5d6b
Scale and keymap storage migrated to shared_ptr; changes from config …
he29-net May 28, 2020
39d12a3
Update scale and keymap lists in clients when an element is changed
he29-net May 29, 2020
ca96392
Mostly GUI tweaks
he29-net May 29, 2020
847ac55
Implement save / load functionality; various other small fixes and ch…
he29-net May 31, 2020
1fac892
Add a few scales and mappings to the default template; update drawing…
he29-net May 31, 2020
fa2483a
Add missing <memory> include
he29-net May 31, 2020
5217dcf
Implement .scl and .kbm save and load functionality
he29-net Jun 5, 2020
b55dbe5
Allow empty keymap, treat it as "all keys, 1:1"
he29-net Jun 6, 2020
2bfd2ed
Propagate keymap updates to PianoRoll and PianoView; fix segfault in …
he29-net Jun 6, 2020
2b51902
GUI tweaks (don't show microtuner options for MIDI-based instruments;…
he29-net Jun 6, 2020
afd06b3
Cleanup pass (code style, dead / debug code, old comments, ..)
he29-net Jun 6, 2020
ef13dc9
Apply suggestions from code review
he29-net Jun 7, 2020
0cbeec1
Change formatting of the Keymap constructor
he29-net Jun 14, 2020
e958de9
Add an explicit QPainterPath include since MacOS suddenly does not bu…
he29-net Jun 14, 2020
b931977
Merge remote-tracking branch 'upstream/master' into microtonal
he29-net Jul 25, 2020
4951321
Merge remote-tracking branch 'upstream/master' into microtonal
he29-net Oct 17, 2020
22e6ed6
Bug fixes after the merge
he29-net Oct 17, 2020
750a547
Fix font metric margin addition
he29-net Oct 19, 2020
a9f7930
Formatting and NULL → nullptr changes from suggestions
he29-net Oct 19, 2020
be82613
Update formatting in src/tracks/InstrumentTrack.cpp
he29-net Oct 19, 2020
7598334
Merge branch 'master' into microtonal
he29-net Oct 19, 2020
0176e99
Update formatting in src/gui/editors/PianoRoll.cpp
he29-net Oct 20, 2020
e714cee
Update formatting in PianoRoll.cpp
he29-net Oct 20, 2020
0009986
Fix octave wrapping for empty scale, remove dead code
he29-net Oct 24, 2020
8077547
Fix note descriptions in Xpressive; request change in model before re…
he29-net Nov 13, 2020
6e03859
Apply suggestions from code review
he29-net Nov 13, 2020
7a5375d
Batch of simple changes suggested in review
he29-net Nov 13, 2020
dd566f5
Batch of fixes and tweaks
he29-net Nov 15, 2020
68f36d7
Apply suggestions from code review
he29-net Nov 15, 2020
b0c5e70
PianoView tweaks
he29-net Nov 15, 2020
ff463a4
Fix Hydrogen import, rewrite upgrade routine
he29-net Nov 26, 2020
b504a6b
Merge branch 'master' into microtonal
he29-net Dec 1, 2020
b606900
Fix merge error
he29-net Dec 1, 2020
6af2964
Oopsie
he29-net Dec 5, 2020
89c2cd4
Merge branch 'master' into microtonal
he29-net Dec 5, 2020
d961a3e
Changes from review (comment update, range based loop, lv2instrument)
he29-net Dec 11, 2020
be245cc
Merge branch 'master' into microtonal
he29-net Dec 11, 2020
1d0b82c
Fix the upgrade routine
he29-net Dec 13, 2020
97470ce
Batch of implemented suggestions from review
he29-net Dec 25, 2020
49176ad
Refactor Scale class (constructors + ratio caching)
he29-net Dec 26, 2020
5f2ab6b
Pass QStrings and vectors in Keymap and Scale using references, remov…
he29-net Dec 28, 2020
c83281e
More accurate PianoView scrolling; fix velocity from height; move bla…
he29-net Dec 28, 2020
18d4a8d
Merge enabled() condition into keyRangeImport(); add missing update t…
he29-net Dec 28, 2020
58be1b6
Remove deprecated bitmaps
he29-net Dec 28, 2020
7d18486
Separate LcdFloatSpinBox to another PR (step 1)
he29-net Dec 28, 2020
9af416b
Separate LcdFloatSpinBox to another PR (step 2)
he29-net Dec 28, 2020
3fcf65b
Merge remote-tracking branch 'upstream/master' into microtonal
he29-net Mar 15, 2021
29c92d8
Replace the placeholder base frequency knob with LcdFloatSpinBox
he29-net Mar 16, 2021
4032005
Merge remote-tracking branch 'upstream/master' into microtonal
he29-net Apr 23, 2021
05f82cf
Cherry pick and modify "The Great Purge (and a modified preset upgrad…
he29-net Apr 23, 2021
2a42b83
Fix kicker basenote in default template; small formatting changes
he29-net Apr 24, 2021
9dcf2ad
Apply suggestions from code review
he29-net Jun 15, 2021
41650d7
Make Microtuner Config window resizable; do not save unnecessary inte…
Jun 15, 2021
8b4ca5b
Move some functions from Microtuner to InstrumentTrack, remove Instru…
he29-net Jun 18, 2021
c0f80f1
Fix forgotten microtuner calls in sfxr and AFP
he29-net Jun 19, 2021
c7024dc
Revert "Pass QStrings and vectors in Keymap and Scale using reference…
he29-net Jul 1, 2021
fe44d15
Revert reverted piece of Keymap.h formatting
he29-net Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix forgotten microtuner calls in sfxr and AFP
  • Loading branch information
@he29-net
he29-net committed Jun 19, 2021
commit c0f80f177815eb2685a75fbadeef324a04fef3ca
2 changes: 1 addition & 1 deletion plugins/audio_file_processor/audio_file_processor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ QString audioFileProcessor::nodeName( void ) const

int audioFileProcessor::getBeatLen( NotePlayHandle * _n ) const
{
const auto baseFreq = instrumentTrack()->microtuner()->baseFreq();
const auto baseFreq = instrumentTrack()->baseFreq();
const float freq_factor = baseFreq / _n->frequency() *
Engine::mixer()->processingSampleRate() / Engine::mixer()->baseSampleRate();

Expand Down
2 changes: 1 addition & 1 deletion plugins/sfxr/sfxr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ void sfxrInstrument::playNote( NotePlayHandle * _n, sampleFrame * _working_buffe
return;
}

const auto baseFreq = instrumentTrack()->microtuner()->baseFreq();
const auto baseFreq = instrumentTrack()->baseFreq();
int32_t pitchedFrameNum = (_n->frequency() / baseFreq) * frameNum;

pitchedFrameNum /= ( currentSampleRate / 44100 );
Expand Down