Skip to content

Commit e132b1b

Browse files
committed
General refactoring and project layout refactoring
1 parent a231c6a commit e132b1b

36 files changed

+2208
-2392
lines changed

.github/contributing.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Building a new version
22
In my setup I configured IntelliJ to generate the correct folder structure using Build->Build Artifacts.
3-
The only manual step before publishing is to rename `library.properties` to `pLaunchControl.txt`
3+
4+
There are 2 manual steps before publishing a new release.
5+
6+
1) Generated the documentation. In IntelliJ, go to `Tools` > `Generate Jadoc...`
7+
2) After building the new artefacts, rename `library.properties` to `pLaunchControl.txt` in the output folder.
48

59
# Publishing a new version
610
Publishing a new version to Processing library repository requires a Github release tagged with `latest`.

.idea/artifacts/processingLibrariesLocal.xml renamed to .idea/artifacts/Local.xml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/artifacts/Publishing.xml

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/artifacts/pLaunchControl_jar.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.idea/workspace.xml

Lines changed: 59 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

library.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ sentence = Control your sketches using the knobs, pads and slider from MIDI cont
3030
# 'sentence' always will be prepended, so you should start by writing the
3131
# second sentence here. If your library only works on certain operating systems,
3232
# mention it here.
33-
paragraph = Once connected to your computer, use the MIDI controller to control your sketch by \
34-
adjusting the values of variables. This is library is not created by or supported by Novation.
33+
paragraph = Once connected to your computer, use the MIDI controller to control your sketch by adjusting the values of variables. This is library is not created by or supported by Novation.
3534

3635
# Links in the 'sentence' and 'paragraph' attributes can be inserted using the
3736
# same syntax as for authors.
@@ -45,7 +44,7 @@ version = 5 # This must be parsable as an int
4544

4645
# The version as the user will see it. If blank, the version attribute will be
4746
# used here. This should be a single word, with no spaces.
48-
prettyVersion = 2.0.0-alpha # This is treated as a String
47+
prettyVersion = 2.1.0
4948

5049
# The min and max revision of Processing compatible with your library.
5150
# Note that these fields use the revision and not the version of Processing,

pLaunchControllerModule/src/pLaunchControl/KNOBS.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* A list of numbers that represent knobs on midi devices.
55
* This list is device-agnostic. To use a list that is
66
* limited to a given device, use an implementation of
7-
* {@link pLaunchControl.midi.MidiDevice}
7+
* {@link MidiDevice}
88
*/
99
public enum KNOBS {
1010
KNOB_01(0),

pLaunchControllerModule/src/pLaunchControl/LaunchControl.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package pLaunchControl;
22

3-
import pLaunchControl.midi.MidiDevice;
43
import processing.core.PApplet;
54
import uk.co.xfactorylibrarians.coremidi4j.CoreMidiDeviceProvider;
65

@@ -189,9 +188,9 @@ public LaunchControl(PApplet parent, boolean debug, String deviceName) throws Mi
189188

190189

191190
println("Resetting the controller...");
192-
deviceOut.getReceiver().send(Utils.getResetMessage(), -1);
191+
deviceOut.getReceiver().send(Message.getResetMessage(), -1);
193192
println("Setting to factory template...");
194-
deviceOut.getReceiver().send(Utils.getSetTemplateMessage(), -1);
193+
deviceOut.getReceiver().send(Message.getSetTemplateMessage(), -1);
195194

196195
setPadMode(PADMODE.TOGGLE);
197196
println("LaunchControl ready!");
@@ -206,7 +205,7 @@ private void sendMidiMessage(MidiMessage message) {
206205
}
207206

208207
public void turnOnFlashing() {
209-
MidiMessage turnOnFlashing = Utils.getTurnOnFlashing(0x08);
208+
MidiMessage turnOnFlashing = Message.getTurnOnFlashing(0x08);
210209
sendMidiMessage(turnOnFlashing);
211210
}
212211

pLaunchControllerModule/src/pLaunchControl/LaunchControlDeviceReceiver.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package pLaunchControl;
22

3-
import pLaunchControl.midi.MidiDevice;
4-
53
import javax.sound.midi.MidiMessage;
64
import javax.sound.midi.Receiver;
75
import javax.sound.midi.SysexMessage;

0 commit comments

Comments
 (0)