summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README4
-rw-r--r--blastem.c10
-rw-r--r--default.cfg1
3 files changed, 7 insertions, 8 deletions
diff --git a/README b/README
index 2acf38c..e9c386b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-BlastEm 0.2.0
+BlastEm 0.3.0
-------------
Installation
@@ -110,3 +110,5 @@ License version 3 or higher. This gives you the right to redistribute and/or
modify the program as long as you follow the terms of the license. See the file
COPYING for full license details.
+Binary releases of BlastEm are packaged with GLEW and SDL2 which have thier own
+licenses. See GLEW-LICENSE and SDL-LICENSE for details.
diff --git a/blastem.c b/blastem.c
index eb09d3e..2e0add7 100644
--- a/blastem.c
+++ b/blastem.c
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
-#define BLASTEM_VERSION "0.2.0"
+#define BLASTEM_VERSION "0.3.0"
#define MCLKS_NTSC 53693175
#define MCLKS_PAL 53203395
@@ -27,6 +27,7 @@
#define MCLKS_PER_YM MCLKS_PER_68K
#define MCLKS_PER_Z80 15
#define MCLKS_PER_PSG (MCLKS_PER_Z80*16)
+#define DEFAULT_SYNC_INTERVAL MCLKS_LINE
//TODO: Figure out the exact value for this
#define LINES_NTSC 262
@@ -225,11 +226,6 @@ m68k_context * sync_components(m68k_context * context, uint32_t address)
uint32_t mclks = context->current_cycle;
sync_z80(z_context, mclks);
sync_sound(gen, mclks);
- while (context->current_cycle > mclks) {
- mclks = context->current_cycle;
- sync_z80(z_context, mclks);
- sync_sound(gen, mclks);
- }
vdp_run_context(v_context, mclks);
if (v_context->frame != last_frame_num) {
//printf("reached frame end %d | MCLK Cycles: %d, Target: %d, VDP cycles: %d, vcounter: %d, hslot: %d\n", last_frame_num, mclks, gen->frame_end, v_context->cycles, v_context->vcounter, v_context->hslot);
@@ -1053,7 +1049,7 @@ int main(int argc, char ** argv)
init_vdp_context(&v_context, version_reg & 0x40);
gen.frame_end = vdp_cycles_to_frame_end(&v_context);
char * config_cycles = tern_find_path(config, "clocks\0max_cycles\0").ptrval;
- gen.max_cycles = config_cycles ? atoi(config_cycles) : 10000000;
+ gen.max_cycles = config_cycles ? atoi(config_cycles) : DEFAULT_SYNC_INTERVAL;
ym2612_context y_context;
ym_init(&y_context, render_sample_rate(), gen.master_clock, MCLKS_PER_YM, render_audio_buffer(), ym_log ? YM_OPT_WAVE_LOG : 0);
diff --git a/default.cfg b/default.cfg
index 1b939be..77dcb52 100644
--- a/default.cfg
+++ b/default.cfg
@@ -73,6 +73,7 @@ audio {
}
clocks {
+ max_cycles 3420
speeds {
1 150
2 200