Global Groove Quantization #4232

tresf · 2018-03-09T16:55:42Z

This supersedes #3296, so there may be some contextual conversations there of importance.

This is an effort coded by @teknopaul but due to merge conflicts has been taken over by @Sawuare / @PhysSong to make it into the 1.3.0 milestone.

This pull request illustrates "groove quantizing" the same "swing" feature that Hydrogen drum machine has.
Currently, there is one global swing amount that affects all instruments in a song. The ability to disable groove per track would be useful.

TODO:

Complete the TODOs and FIXMEs in the code.
Move enable/disable groove per instrument track from the TrackOperationsWidget to the InstrumentMiscView.
Move groove near tempo and time signature controls.
Use an AutomatableSlider instead of a Knob for changing groove amount.
Style the groove slider like the master volume and pitch sliders.
Refactor.
Fix coding conventions.
Update the factory templates.
Move groove settings out of the tuning tab

Closes #1091.

@teknopaul

Add initial support for "Groove quantizing". This is a squash of all work by @teknopaul, @tresf, @Sawuare to make it mergabe against master.

src/core/Groove.cpp

Wallacoloo · 2018-03-10T11:01:06Z

include/GrooveExperiments.h

+public:
+	GrooveExperiments(QObject *parent=0 );
+
+	virtual ~GrooveExperiments();


Instead of defining ~GrooveExperiments with an empty body in the .cpp file, you can just say virtual ~GrooveExperiments() = default here and omit the body.

Wallacoloo · 2018-03-10T11:01:36Z

src/core/GrooveExperiments.cpp

+
+}
+
+int GrooveExperiments::amount()


This method should be const?

Wallacoloo · 2018-03-10T11:03:15Z

src/core/HalfSwing.cpp

+
+HalfSwing::HalfSwing(QObject * _parent) :
+	QObject( _parent ),
+	Groove()


If you aren't passing parameters into the Groove constructor, you can omit this Groove() bit - Groove will be default-initialized.

Wallacoloo · 2018-03-10T11:09:19Z

src/tracks/InstrumentTrack.cpp

@@ -149,6 +151,10 @@ InstrumentTrack::~InstrumentTrack()

 	// now we're save deleting the instrument
 	if( m_instrument ) delete m_instrument;
+
+	if (m_noGroove != NULL) {
+		delete m_noGroove;


FWIW it's valid to delete a NULL pointer (it just doesn't do anything). Putting this behind a conditional is superfluous.

Per #3296 (comment)

...instead of Knob & FloatModel

PhysSong · 2018-03-15T01:58:11Z

I'm going to do some refactoring to reduce code duplication. @Sawuare Is it fine for you to push my work once done?

husamalhomsi · 2018-03-15T11:55:15Z

@PhysSong Absolutely. :)

src/core/GrooveFactory.cpp

Put Half after Hydrogen because Half is based on Hydrogen.

And some improvements

husamalhomsi · 2018-03-31T10:58:25Z

The groove slider code is duplicated in these 3 groove types: Hydrogen swing, Half swing, and Groove experiments.
I tried to refactor the code into Groove view to make the groove types mentioned above use the same slider (so that changing the groove type does not reset the slider), but failed. @PhysSong, are you interested in refactoring it?

PhysSong · 2018-03-31T11:05:43Z

I want to consolidate them, too. I'm also going to refactor whole widgets' code. And next, I'm going to look into core functions.

PhysSong · 2018-04-27T01:38:04Z

I think we should change class hierarchy a lot to make the code better.
GrooveView should be the base class for views for individual grooves, not the view in the song editor. It will reduce code duplication and make it easy to manage views for grooves.
I'm going to create new classes, GrooveManager and GrooveManagerView. The new view will play a role which was done by GrooveView.
I think it might be better to allow creating grooves as external plugins. To do this, I'll remove uses of hard-coded list in GrooveFactory::create to allow adding new grooves flexibly.

If anyone have some ideas, please let me know.

...from the TrackOperationsWidget to the InstrumentMiscView.

husamalhomsi · 2019-11-07T05:27:09Z

@PhysSong I think it would be best to refactor the code first, so you go ahead.

LmmsBot · 2019-11-19T06:36:02Z

🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩

Linux

Linux (AppImage): lmms-1.3.0-alpha.1.215+g193c30f88-linux-x86_64.AppImage (build link)

Windows

Windows 32-bit: lmms-1.3.0-alpha.1.215+g193c30f88-mingw-win32.exe (build link)
Windows 64-bit: lmms-1.3.0-alpha.1.215+g193c30f88-mingw-win64.exe (build link)
Windows 32-bit: lmms-1.3.0-alpha-msvc2017-win32.exe (build link)
Windows 64-bit: lmms-1.3.0-alpha-msvc2017-win64.exe (build link)
Windows 32-bit: lmms-1.3.0-alpha-msvc2017-win32.exe (build link)
Windows 64-bit: lmms-1.3.0-alpha-msvc2017-win64.exe (build link)

macOS

macOS : lmms-1.3.0-alpha.1.215+g193c30f88-mac10.14.dmg (build link)

🤖

{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://output.circle-artifacts.com/output/job/d6b42ac6-2ba6-4dc9-be34-6f00758f2cce/artifacts/0/lmms-1.3.0-alpha.1.215+g193c30f88-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/17260?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://output.circle-artifacts.com/output/job/264c4a6f-2ee8-45e6-a2f0-7710b65f2443/artifacts/0/lmms-1.3.0-alpha.1.215+g193c30f88-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/17256?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://output.circle-artifacts.com/output/job/4872c59c-a8cd-435f-ba2e-db49d4a17672/artifacts/0/lmms-1.3.0-alpha.1.215+g193c30f88-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/17257?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/cfsbhc89kdru5qp2/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/43900197"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/t8tj3glwd3qw4jgy/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/43900197"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/yv5sgni4gbarlvaa/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/43900198"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/614xit5o0jckhvar/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/43900198"}], "macOS": [{"artifact": {"title": {"title": "", "platform_name": "macOS"}, "link": {"link": "https://output.circle-artifacts.com/output/job/5cdb317b-2331-4982-af50-604b7f3f3605/artifacts/0/lmms-1.3.0-alpha.1.215+g193c30f88-mac10.14.dmg"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/17258?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}]}, "commit_sha": "193c30f888a1db2cad7f699eb37a00d4e416234d"}

PhysSong · 2019-11-19T07:32:59Z

src/core/GrooveExperiments.cpp

+	int posInEigth = -1;
+	if (posInBeat >= 36 && posInBeat < 48)
+	{
+		// third quarter


Is this 0-based or 1-based? The comments look inconsistent.

This comment says the 3rd quarter starts at tick 36, but another comment says the 2nd quarter starts at tick 12...

PhysSong · 2019-11-21T01:58:49Z

@Sawuare Please feel free to add commits before I do, I need some time to design classes and the hierachy.

Gps2010 · 2024-03-05T17:51:26Z

Hi guys
Is this still work in progress, or should I abandon all hope? :)

zonkmachine · 2024-04-14T18:25:35Z

Is this still work in progress, or should I abandon all hope? :)

Both I believe...

PhysSong · 2024-04-16T01:29:46Z

In the meantime, I resolved merge conflicts. I hope I can get back to this one next month.

Initial global groove quantization feature

957ec6b

Add initial support for "Groove quantizing". This is a squash of all work by @teknopaul, @tresf, @Sawuare to make it mergabe against master.

tresf added enhancement in progress labels Mar 9, 2018

tresf added this to the 1.3.0 milestone Mar 9, 2018

tresf assigned husamalhomsi Mar 9, 2018

tresf changed the base branch from stable-1.2 to master March 9, 2018 16:55

tresf mentioned this pull request Mar 9, 2018

Global groove features for InstrumentTrack #3296

Closed

6 tasks

Wallacoloo reviewed Mar 10, 2018

View reviewed changes

src/core/Groove.cpp Outdated Show resolved Hide resolved

Wallacoloo reviewed Mar 10, 2018

View reviewed changes

src/core/GrooveExperiments.cpp Outdated

}

int GrooveExperiments::amount()

Copy link

Member

Wallacoloo Mar 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method should be const?

Wallacoloo reviewed Mar 10, 2018

View reviewed changes

Hussam Eddin Alhomsi and others added 5 commits March 11, 2018 15:50

Remove Studio Controller

46fa180

Per #3296 (comment)

Move Groove to global toolbar

3866cef

Use AutomatableSlider & IntModel...

46a2f78

...instead of Knob & FloatModel

Update old homepage URL and program name

d6529ae

Reduce code duplications

ad9ea6f

clouedoc reviewed Mar 22, 2018

View reviewed changes

src/core/GrooveFactory.cpp Outdated Show resolved Hide resolved

PhysSong and others added 4 commits March 28, 2018 09:44

Reformat code

217c31a

Do more reformattings

81e0fe2

Reorder the swings

8fa33a8

Put Half after Hydrogen because Half is based on Hydrogen.

Remove unused code

9e23b2a

And some improvements

Hussam Eddin Alhomsi and others added 3 commits April 28, 2018 18:28

Move enable/disable groove per instrument track...

3760e46

...from the TrackOperationsWidget to the InstrumentMiscView.

Merge branch 'master' into groove

7117d90

Merge remote-tracking branch 'lmms/master' into groove

1b9f282

PhysSong self-assigned this Nov 7, 2019

PhysSong added 3 commits November 19, 2019 15:10

Merge branch 'master' into groove

6122d0f

Remove exprtk.hpp.patch

14f894c

Minor formatting changes

170c8b9

PhysSong reviewed Nov 19, 2019

View reviewed changes

ryuukumar mentioned this pull request Jul 21, 2020

Reorganising LMMS, renaming editors and classes and everything in between (cont. #120) #5592

Closed

56 tasks

tresf marked this pull request as draft January 13, 2021 20:42

Spekular modified the milestones: 1.3, 1.3+ Mar 12, 2021

spechtstatt mentioned this pull request Nov 6, 2021

Support note filtering inside MIDI input instrument settings #6210

Closed

PhysSong added rework required Pull requests which must be reworked to make it able to merge or review and removed in progress rework required Pull requests which must be reworked to make it able to merge or review labels Feb 5, 2022

Merge branch 'master' into groove

b2057ae

PhysSong force-pushed the groove branch from e51e0b3 to b2057ae Compare February 5, 2022 05:54

PhysSong added 6 commits March 3, 2022 10:29

Merge branch 'master' into groove

fe9c8b6

Fix includes

1dbf6aa

Merge branch 'master' into groove

193c30f

Merge branch 'master' into groove

9422165

Reformat and modernize a bit

9b3fe5e

Fix namespace comments

dfc7eab

husamalhomsi removed their assignment Mar 6, 2024

PhysSong added 2 commits April 16, 2024 09:55

Merge branch 'master' into groove

cbcde94

Remove connections to a nonexistent signal

013aef5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Global Groove Quantization #4232

Global Groove Quantization #4232

tresf commented Mar 9, 2018 •

edited by PhysSong

Loading

Wallacoloo Mar 10, 2018

Wallacoloo Mar 10, 2018

Wallacoloo Mar 10, 2018

Wallacoloo Mar 10, 2018

PhysSong commented Mar 15, 2018

husamalhomsi commented Mar 15, 2018

husamalhomsi commented Mar 31, 2018

PhysSong commented Mar 31, 2018

PhysSong commented Apr 27, 2018

husamalhomsi commented Nov 7, 2019

LmmsBot commented Nov 19, 2019 •

edited

Loading

Linux

Windows

macOS

PhysSong Nov 19, 2019

PhysSong Nov 19, 2019

PhysSong commented Nov 21, 2019

Gps2010 commented Mar 5, 2024

zonkmachine commented Apr 14, 2024

PhysSong commented Apr 16, 2024

Global Groove Quantization #4232

Are you sure you want to change the base?

Global Groove Quantization #4232

Conversation

tresf commented Mar 9, 2018 • edited by PhysSong Loading

Wallacoloo Mar 10, 2018

Choose a reason for hiding this comment

Wallacoloo Mar 10, 2018

Choose a reason for hiding this comment

Wallacoloo Mar 10, 2018

Choose a reason for hiding this comment

Wallacoloo Mar 10, 2018

Choose a reason for hiding this comment

PhysSong commented Mar 15, 2018

husamalhomsi commented Mar 15, 2018

husamalhomsi commented Mar 31, 2018

PhysSong commented Mar 31, 2018

PhysSong commented Apr 27, 2018

husamalhomsi commented Nov 7, 2019

LmmsBot commented Nov 19, 2019 • edited Loading

Linux

Windows

macOS

PhysSong Nov 19, 2019

Choose a reason for hiding this comment

PhysSong Nov 19, 2019

Choose a reason for hiding this comment

PhysSong commented Nov 21, 2019

Gps2010 commented Mar 5, 2024

zonkmachine commented Apr 14, 2024

PhysSong commented Apr 16, 2024

tresf commented Mar 9, 2018 •

edited by PhysSong

Loading

LmmsBot commented Nov 19, 2019 •

edited

Loading