diff --git a/sound-driver/melody_pling.c b/sound-driver/melody_pling.c index 9696eed..05c3722 100644 --- a/sound-driver/melody_pling.c +++ b/sound-driver/melody_pling.c @@ -27,7 +27,7 @@ t_melodies pling = { }; void playPling() { - pling.amplitude = configGetEffectsAmplitudePtr(); + pling.p_amplitude = configGetEffectsAmplitudePtr(); sequencerPlayMelodies(&pling); } diff --git a/sound-driver/melody_tetris.c b/sound-driver/melody_tetris.c index 046ed6e..a1d9102 100644 --- a/sound-driver/melody_tetris.c +++ b/sound-driver/melody_tetris.c @@ -933,7 +933,7 @@ t_melodies tetrisTheme = { void playMelodyTetris() { tetrisTheme.pace = INITIAL_PACE; // reset to start value each time - tetrisTheme.amplitude = configGetMelodyAmplitudePtr(); + tetrisTheme.p_amplitude = configGetMelodyAmplitudePtr(); sequencerPlayMelodies(&tetrisTheme); } diff --git a/sound-driver/melody_tusch1.c b/sound-driver/melody_tusch1.c index dec0a88..bf192d3 100644 --- a/sound-driver/melody_tusch1.c +++ b/sound-driver/melody_tusch1.c @@ -79,7 +79,7 @@ t_melodies tusch1 = { }; void playTusch1() { - tusch1.amplitude = configGetEffectsAmplitudePtr(); + tusch1.p_amplitude = configGetEffectsAmplitudePtr(); sequencerPlayMelodies(&tusch1); } diff --git a/sound-driver/sequencer.c b/sound-driver/sequencer.c index 7c29daf..683e33c 100644 --- a/sound-driver/sequencer.c +++ b/sound-driver/sequencer.c @@ -59,7 +59,7 @@ void sequencerExec(void *handle) { if (melody->tones[melody->idx].length == e_L_EndMark) { 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) ? (calcLength(melodies, melody->tones[melody->idx].length) / 2) : calcLength(melodies, melody->tones[melody->idx].length); diff --git a/sound-driver/sequencer.h b/sound-driver/sequencer.h index 58acb75..1bff754 100644 --- a/sound-driver/sequencer.h +++ b/sound-driver/sequencer.h @@ -52,7 +52,7 @@ typedef struct { typedef struct { uint8_t slotMask; uint8_t chip; - uint8_t *amplitude; + uint8_t *p_amplitude; uint8_t taskId; uint16_t quarterLength; uint8_t numOfMelodies;