Fixed mixer problems, re-enabled vga

This commit is contained in:
rnlf
2017-01-22 20:36:41 +01:00
parent 3c4cb195e0
commit b23d4f020e
2 changed files with 2 additions and 2 deletions

View File

@@ -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();

View File

@@ -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) {