Rev 883 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 883 | Rev 1099 | ||
|---|---|---|---|
| Line 4... | Line 4... | ||
| 4 | #include "vars.h" |
4 | #include "vars.h" |
| 5 | #include "gs.h" |
5 | #include "gs.h" |
| 6 | #include "tape.h" |
6 | #include "tape.h" |
| 7 | #include "config.h" |
7 | #include "config.h" |
| 8 | #include "sndrender/sndcounter.h" |
8 | #include "sndrender/sndcounter.h" |
| - | 9 | #include "sndrender/dev_moonsound.h" |
|
| 9 | #include "sound.h" |
10 | #include "sound.h" |
| 10 | 11 | ||
| 11 | 12 | ||
| 12 | int spkr_dig = 0, mic_dig = 0, covFB_vol = 0, covDD_vol = 0, sd_l = 0, sd_r = 0; |
13 | int spkr_dig = 0, mic_dig = 0, covFB_vol = 0, covDD_vol = 0, sd_l = 0, sd_r = 0; |
| 13 | 14 | ||
| Line 35... | Line 36... | ||
| 35 | if (conf.sound.ay_scheme > AY_SCHEME_SINGLE) |
36 | if (conf.sound.ay_scheme > AY_SCHEME_SINGLE) |
| 36 | ay[1].start_frame(); |
37 | ay[1].start_frame(); |
| 37 | } |
38 | } |
| 38 | 39 | ||
| 39 | Saa1099.start_frame(); |
40 | Saa1099.start_frame(); |
| - | 41 | zxmmoonsound.start_frame(); |
|
| 40 | 42 | ||
| 41 | #ifdef MOD_GS |
43 | #ifdef MOD_GS |
| 42 | init_gs_frame(); |
44 | init_gs_frame(); |
| 43 | #endif |
45 | #endif |
| 44 | } |
46 | } |
| Line 104... | Line 106... | ||
| 104 | 106 | ||
| 105 | vtxbuffilled += 14; |
107 | vtxbuffilled += 14; |
| 106 | } |
108 | } |
| 107 | } |
109 | } |
| 108 | Saa1099.end_frame(endframe); |
110 | Saa1099.end_frame(endframe); |
| - | 111 | zxmmoonsound.end_frame(endframe); |
|
| 109 | 112 | ||
| 110 | sound.end_frame(endframe); |
113 | sound.end_frame(endframe); |
| 111 | // if (comp.tape.play_pointer) // play tape pulses |
114 | // if (comp.tape.play_pointer) // play tape pulses |
| 112 | comp.tape.sound.end_frame(endframe); |
115 | comp.tape.sound.end_frame(endframe); |
| 113 | // else comp.tape.sound.end_empty_frame(endframe); |
116 | // else comp.tape.sound.end_empty_frame(endframe); |
| Line 123... | Line 126... | ||
| 123 | if (conf.sound.ay_scheme > AY_SCHEME_SINGLE) |
126 | if (conf.sound.ay_scheme > AY_SCHEME_SINGLE) |
| 124 | sndcounter.count(ay[1]); |
127 | sndcounter.count(ay[1]); |
| 125 | } |
128 | } |
| 126 | 129 | ||
| 127 | sndcounter.count(Saa1099); |
130 | sndcounter.count(Saa1099); |
| - | 131 | sndcounter.count(zxmmoonsound); |
|
| 128 | 132 | ||
| 129 | #ifdef MOD_GS |
133 | #ifdef MOD_GS |
| 130 | #ifdef MOD_GSZ80 |
134 | #ifdef MOD_GSZ80 |
| 131 | if (conf.gs_type==1) |
135 | if (conf.gs_type==1) |
| 132 | sndcounter.count(z80gs::sound); |
136 | sndcounter.count(z80gs::sound); |
| Line 216... | Line 220... | ||
| 216 | ay[0].set_timings(cpufq, conf.sound.ayfq, conf.sound.fq); |
220 | ay[0].set_timings(cpufq, conf.sound.ayfq, conf.sound.fq); |
| 217 | if (conf.sound.ay_scheme > AY_SCHEME_SINGLE) ay[1].set_timings(cpufq, conf.sound.ayfq, conf.sound.fq); |
221 | if (conf.sound.ay_scheme > AY_SCHEME_SINGLE) ay[1].set_timings(cpufq, conf.sound.ayfq, conf.sound.fq); |
| 218 | } |
222 | } |
| 219 | 223 | ||
| 220 | Saa1099.set_timings(cpufq, conf.sound.saa1099fq, conf.sound.fq); |
224 | Saa1099.set_timings(cpufq, conf.sound.saa1099fq, conf.sound.fq); |
| - | 225 | zxmmoonsound.set_timings(cpufq, 33868800, conf.sound.fq); |
|
| 221 | 226 | ||
| 222 | // comp.tape.sound.clear(); |
227 | // comp.tape.sound.clear(); |
| 223 | #ifdef MOD_GS |
228 | #ifdef MOD_GS |
| 224 | reset_gs_sound(); |
229 | reset_gs_sound(); |
| 225 | #endif |
230 | #endif |