Skip to content

Commit

Permalink
Add label for key. Promise nothing broke =)
Browse files Browse the repository at this point in the history
  • Loading branch information
hirthy committed Mar 29, 2011
1 parent b2ce479 commit 14a89c5
Showing 1 changed file with 23 additions and 4 deletions.
27 changes: 23 additions & 4 deletions src/SwingTest.java
Expand Up @@ -146,10 +146,16 @@ public class SwingTest extends JFrame implements KeyListener {

private DKnob loKnob, pitchKnob, depthKnob, rateKnob, panKnob;

JLabel[] instrumLabels = new JLabel[]{oneLabel, twoLabel, threeLabel, fourLabel, fiveLabel, sixLabel, sevenLabel, eightLabel, nineLabel, zeroLabel};
JLabel[] knobLabels = new JLabel[]{lowpassLabel, pitchLabel, panLabel, depthLabel, rateLabel};
JLabel[] effectLabels = new JLabel[]{delayLabel, reverbLabel};
JLabel[] scaleLabels = new JLabel[]{majorLabel, minorLabel, chromaticLabel, bluesLabel};
private int keyCounter;

private JLabel[] instrumLabels = new JLabel[]{oneLabel, twoLabel, threeLabel, fourLabel, fiveLabel, sixLabel, sevenLabel, eightLabel, nineLabel, zeroLabel};
private JLabel[] knobLabels = new JLabel[]{lowpassLabel, pitchLabel, panLabel, depthLabel, rateLabel};
private JLabel[] effectLabels = new JLabel[]{delayLabel, reverbLabel};
private JLabel[] scaleLabels = new JLabel[]{majorLabel, minorLabel, chromaticLabel, bluesLabel};

private String[] keys = new String[]{"A", "Ab/A#", "B", "C", "C#/Db", "D", "D#/Eb", "E", "F", "F#,Gb", "G", "G#/Gb"};
private JLabel keyLabel = new JLabel("Up/Down Key: ");
private JLabel key = new JLabel(keys[0]);

private boolean fxEnabled = false;
private boolean reverbEnabled = false;
Expand Down Expand Up @@ -297,6 +303,15 @@ public void makeControls()
extraControls.add(label);
extraControls.add(Box.createHorizontalGlue());
}
// Key label
key.setFont(effectFont);
key.setForeground(effectText);
keyLabel.setFont(effectFont);
keyLabel.setForeground(effectText);
extraControls.add(keyLabel);
extraControls.add(key);
extraControls.add(Box.createHorizontalGlue());

// Set defaults extra labels
minorLabel.setForeground(scaleSelText);
}
Expand Down Expand Up @@ -404,9 +419,13 @@ public void keyPressed(KeyEvent e)
break;
case KeyEvent.VK_UP:
kaoss.changePitch(1);
keyCounter++;
key.setText(keys[keyCounter % 12]);
break;
case KeyEvent.VK_DOWN:
kaoss.changePitch(-1);
keyCounter--;
key.setText(keys[keyCounter % 12]);
break;
default:
int id = Character.getNumericValue(e.getKeyChar());
Expand Down

1 comment on commit 14a89c5

@hirthy
Copy link
Collaborator Author

@hirthy hirthy commented on 14a89c5 Mar 29, 2011

Choose a reason for hiding this comment

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

Does not change if base frequency changes. Will fix later.

Please sign in to comment.