Fixed mixer problems, re-enabled vga
This commit is contained in:
@@ -59,7 +59,7 @@ int main(int argc, char **argv) {
|
|||||||
/* Init everything */
|
/* Init everything */
|
||||||
atexit(deinit);
|
atexit(deinit);
|
||||||
soundblaster_init(mixer_getNextBlock);
|
soundblaster_init(mixer_getNextBlock);
|
||||||
//vga_init();
|
vga_init();
|
||||||
palette_init();
|
palette_init();
|
||||||
keyboard_init();
|
keyboard_init();
|
||||||
mouse_init();
|
mouse_init();
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ void mixer_mix(void) {
|
|||||||
|
|
||||||
for(int i = 0; i < activeSources; ++i) {
|
for(int i = 0; i < activeSources; ++i) {
|
||||||
mixed_sound_t *snd = sources + i;
|
mixed_sound_t *snd = sources + i;
|
||||||
int len = snd->source->sampleCount;
|
int len = snd->source->sampleCount - snd->offset;
|
||||||
int16_t const* sourceBuf = snd->source->samples + snd->offset;
|
int16_t const* sourceBuf = snd->source->samples + snd->offset;
|
||||||
|
|
||||||
if(len > SOUNDBLASTER_SAMPLES_PER_BUFFER) {
|
if(len > SOUNDBLASTER_SAMPLES_PER_BUFFER) {
|
||||||
|
|||||||
Reference in New Issue
Block a user