diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/sequencer.c | 21 | ||||
-rw-r--r-- | src/settings.c | 2 |
2 files changed, 3 insertions, 20 deletions
diff --git a/src/sequencer.c b/src/sequencer.c index ab21274..56279bc 100644 --- a/src/sequencer.c +++ b/src/sequencer.c | |||
@@ -161,8 +161,6 @@ play_step(void) { | |||
161 | | SOUND_SWEEP_DIR(params->sweep_direction) | 161 | | SOUND_SWEEP_DIR(params->sweep_direction) |
162 | | SOUND_SWEEP_TIME(params->sweep_time); | 162 | | SOUND_SWEEP_TIME(params->sweep_time); |
163 | } | 163 | } |
164 | SOUND_SQUARE1_FREQ = SOUND_FREQ_RESET; | ||
165 | SOUND_SQUARE1_CTRL = 0; | ||
166 | asm("nop"); asm("nop"); | 164 | asm("nop"); asm("nop"); |
167 | asm("nop"); asm("nop"); | 165 | asm("nop"); asm("nop"); |
168 | asm("nop"); asm("nop"); | 166 | asm("nop"); asm("nop"); |
@@ -200,12 +198,6 @@ play_step(void) { | |||
200 | TriggerNote *trig = &pat->ch2.notes[step_counter]; | 198 | TriggerNote *trig = &pat->ch2.notes[step_counter]; |
201 | ChannelSquareParams *params = &pat->ch2.params[step_counter]; | 199 | ChannelSquareParams *params = &pat->ch2.params[step_counter]; |
202 | if (trig->active && should_play(params->prob)) { | 200 | if (trig->active && should_play(params->prob)) { |
203 | SOUND_SQUARE2_FREQ = SOUND_FREQ_RESET; | ||
204 | SOUND_SQUARE2_CTRL = 0; | ||
205 | asm("nop"); asm("nop"); | ||
206 | asm("nop"); asm("nop"); | ||
207 | asm("nop"); asm("nop"); | ||
208 | asm("nop"); asm("nop"); | ||
209 | SOUND_SQUARE2_CTRL = SOUND_SQUARE_ENV_VOL(params->env_volume) | 201 | SOUND_SQUARE2_CTRL = SOUND_SQUARE_ENV_VOL(params->env_volume) |
210 | | SOUND_SQUARE_ENV_TIME(params->env_time) | 202 | | SOUND_SQUARE_ENV_TIME(params->env_time) |
211 | | SOUND_SQUARE_ENV_DIR(params->env_direction) | 203 | | SOUND_SQUARE_ENV_DIR(params->env_direction) |
@@ -508,12 +500,12 @@ stop_sound(void) { | |||
508 | asm("nop"); asm("nop"); | 500 | asm("nop"); asm("nop"); |
509 | asm("nop"); asm("nop"); | 501 | asm("nop"); asm("nop"); |
510 | SOUND_SQUARE1_FREQ = SOUND_FREQ_RESET; | 502 | SOUND_SQUARE1_FREQ = SOUND_FREQ_RESET; |
511 | SOUND_SQUARE2_FREQ = SOUND_FREQ_RESET; | ||
512 | SOUND_WAVE_FREQ = SOUND_FREQ_RESET; | ||
513 | SOUND_NOISE_FREQ = SOUND_FREQ_RESET; | ||
514 | SOUND_SQUARE1_CTRL = 0; | 503 | SOUND_SQUARE1_CTRL = 0; |
504 | SOUND_SQUARE2_FREQ = SOUND_FREQ_RESET; | ||
515 | SOUND_SQUARE2_CTRL = 0; | 505 | SOUND_SQUARE2_CTRL = 0; |
506 | SOUND_WAVE_FREQ = SOUND_FREQ_RESET; | ||
516 | SOUND_WAVE_CTRL = 0; | 507 | SOUND_WAVE_CTRL = 0; |
508 | SOUND_NOISE_FREQ = SOUND_FREQ_RESET; | ||
517 | SOUND_NOISE_CTRL = 0; | 509 | SOUND_NOISE_CTRL = 0; |
518 | redraw_play_pause = true; | 510 | redraw_play_pause = true; |
519 | redraw_pattern_buttons = true; | 511 | redraw_pattern_buttons = true; |
@@ -1500,13 +1492,6 @@ handle_sequencer_input(void) { | |||
1500 | } | 1492 | } |
1501 | } | 1493 | } |
1502 | 1494 | ||
1503 | static int in_ticks = 0; | ||
1504 | |||
1505 | void | ||
1506 | reset_serial_in(void) { | ||
1507 | in_ticks = 0; | ||
1508 | } | ||
1509 | |||
1510 | void | 1495 | void |
1511 | serial_irq(void) { | 1496 | serial_irq(void) { |
1512 | if (play_status) { | 1497 | if (play_status) { |
diff --git a/src/settings.c b/src/settings.c index 7cebcf6..374618c 100644 --- a/src/settings.c +++ b/src/settings.c | |||
@@ -8,7 +8,6 @@ static Settings settings = { | |||
8 | }; | 8 | }; |
9 | static int settings_cursor_loc = 0; | 9 | static int settings_cursor_loc = 0; |
10 | 10 | ||
11 | void reset_serial_in(void); | ||
12 | void serial_irq(void); | 11 | void serial_irq(void); |
13 | void stop_sound(void); | 12 | void stop_sound(void); |
14 | void toggle_playing(void); | 13 | void toggle_playing(void); |
@@ -17,7 +16,6 @@ void | |||
17 | set_audio_settings(void) { | 16 | set_audio_settings(void) { |
18 | stop_sound(); | 17 | stop_sound(); |
19 | if (settings.sync == SYNC_IN_LINK) { | 18 | if (settings.sync == SYNC_IN_LINK) { |
20 | reset_serial_in(); | ||
21 | irs_set(IRQ_SERIAL, serial_irq); | 19 | irs_set(IRQ_SERIAL, serial_irq); |
22 | irs_set(IRQ_TIMER_2, NULL); | 20 | irs_set(IRQ_TIMER_2, NULL); |
23 | SIO_MODE = SIO_MODE_GP | 21 | SIO_MODE = SIO_MODE_GP |