naming
This commit is contained in:
parent
9a0e3be4fe
commit
95ad5a9e9f
@ -27,7 +27,7 @@ t_melodies pling = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
void playPling() {
|
void playPling() {
|
||||||
pling.amplitude = configGetEffectsAmplitudePtr();
|
pling.p_amplitude = configGetEffectsAmplitudePtr();
|
||||||
sequencerPlayMelodies(&pling);
|
sequencerPlayMelodies(&pling);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -933,7 +933,7 @@ t_melodies tetrisTheme = {
|
|||||||
|
|
||||||
void playMelodyTetris() {
|
void playMelodyTetris() {
|
||||||
tetrisTheme.pace = INITIAL_PACE; // reset to start value each time
|
tetrisTheme.pace = INITIAL_PACE; // reset to start value each time
|
||||||
tetrisTheme.amplitude = configGetMelodyAmplitudePtr();
|
tetrisTheme.p_amplitude = configGetMelodyAmplitudePtr();
|
||||||
sequencerPlayMelodies(&tetrisTheme);
|
sequencerPlayMelodies(&tetrisTheme);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@ t_melodies tusch1 = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
void playTusch1() {
|
void playTusch1() {
|
||||||
tusch1.amplitude = configGetEffectsAmplitudePtr();
|
tusch1.p_amplitude = configGetEffectsAmplitudePtr();
|
||||||
sequencerPlayMelodies(&tusch1);
|
sequencerPlayMelodies(&tusch1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ void sequencerExec(void *handle) {
|
|||||||
if (melody->tones[melody->idx].length == e_L_EndMark) {
|
if (melody->tones[melody->idx].length == e_L_EndMark) {
|
||||||
melody->idx = 0;
|
melody->idx = 0;
|
||||||
}
|
}
|
||||||
psgPlayTone(melodies->chip, channel, *(melodies->amplitude), melody->tones[melody->idx].octave, melody->tones[melody->idx].note);
|
psgPlayTone(melodies->chip, channel, *(melodies->p_amplitude), melody->tones[melody->idx].octave, melody->tones[melody->idx].note);
|
||||||
melody->lengthCnt = (melody->tones[melody->idx].staccato) ?
|
melody->lengthCnt = (melody->tones[melody->idx].staccato) ?
|
||||||
(calcLength(melodies, melody->tones[melody->idx].length) / 2) :
|
(calcLength(melodies, melody->tones[melody->idx].length) / 2) :
|
||||||
calcLength(melodies, melody->tones[melody->idx].length);
|
calcLength(melodies, melody->tones[melody->idx].length);
|
||||||
|
@ -52,7 +52,7 @@ typedef struct {
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
uint8_t slotMask;
|
uint8_t slotMask;
|
||||||
uint8_t chip;
|
uint8_t chip;
|
||||||
uint8_t *amplitude;
|
uint8_t *p_amplitude;
|
||||||
uint8_t taskId;
|
uint8_t taskId;
|
||||||
uint16_t quarterLength;
|
uint16_t quarterLength;
|
||||||
uint8_t numOfMelodies;
|
uint8_t numOfMelodies;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user