From 00439f4d4925d1ba60a2aaf36849df8aeb00f246 Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Tue, 23 May 2017 23:18:16 +0300 Subject: [PATCH] SDL port: added drag and drop support, added model switch command, fixed macOS audio --- Makefile | 23 +++--- SDL/drop.bmp | Bin 0 -> 69176 bytes SDL/main.c | 209 ++++++++++++++++++++++++++++++++++----------------- 3 files changed, 155 insertions(+), 77 deletions(-) create mode 100644 SDL/drop.bmp diff --git a/Makefile b/Makefile index 2779032..3205ec3 100755 --- a/Makefile +++ b/Makefile @@ -79,16 +79,16 @@ endif # Define our targets ifeq ($(PLATFORM),windows32) -SDL_TARGET := $(BIN)/sdl/sameboy.exe $(BIN)/sdl/sameboy_debugger.exe $(BIN)/sdl/SDL2.dll +SDL_TARGET := $(BIN)/SDL/sameboy.exe $(BIN)/SDL/sameboy_debugger.exe $(BIN)/SDL/SDL2.dll TESTER_TARGET := $(BIN)/tester/sameboy_tester.exe else -SDL_TARGET := $(BIN)/sdl/sameboy +SDL_TARGET := $(BIN)/SDL/sameboy TESTER_TARGET := $(BIN)/tester/sameboy_tester endif cocoa: $(BIN)/SameBoy.app quicklook: $(BIN)/SameBoy.qlgenerator -sdl: $(SDL_TARGET) $(BIN)/sdl/dmg_boot.bin $(BIN)/sdl/cgb_boot.bin $(BIN)/sdl/LICENSE $(BIN)/sdl/registers.sym +sdl: $(SDL_TARGET) $(BIN)/SDL/dmg_boot.bin $(BIN)/SDL/cgb_boot.bin $(BIN)/SDL/LICENSE $(BIN)/SDL/registers.sym $(BIN)/SDL/drop.bmp bootroms: $(BIN)/BootROMs/cgb_boot.bin $(BIN)/BootROMs/dmg_boot.bin tester: $(TESTER_TARGET) $(BIN)/tester/dmg_boot.bin $(BIN)/tester/cgb_boot.bin all: cocoa sdl tester @@ -209,7 +209,7 @@ $(BIN)/SameBoy.qlgenerator/Contents/Resources/cgb_boot_fast.bin: $(BIN)/BootROMs # SDL Port # Unix versions build only one binary -$(BIN)/sdl/sameboy: $(CORE_OBJECTS) $(SDL_OBJECTS) +$(BIN)/SDL/sameboy: $(CORE_OBJECTS) $(SDL_OBJECTS) -@$(MKDIR) -p $(dir $@) $(CC) $^ -o $@ $(LDFLAGS) $(SDL_LDFLAGS) ifeq ($(CONF), release) @@ -217,11 +217,11 @@ ifeq ($(CONF), release) endif # Windows version builds two, one with a conole and one without it -$(BIN)/sdl/sameboy.exe: $(CORE_OBJECTS) $(SDL_OBJECTS) $(OBJ)/Windows/resources.o +$(BIN)/SDL/sameboy.exe: $(CORE_OBJECTS) $(SDL_OBJECTS) $(OBJ)/Windows/resources.o -@$(MKDIR) -p $(dir $@) $(CC) $^ -o $@ $(LDFLAGS) $(SDL_LDFLAGS) -Wl,/subsystem:windows -$(BIN)/sdl/sameboy_debugger.exe: $(CORE_OBJECTS) $(SDL_OBJECTS) $(OBJ)/Windows/resources.o +$(BIN)/SDL/sameboy_debugger.exe: $(CORE_OBJECTS) $(SDL_OBJECTS) $(OBJ)/Windows/resources.o -@$(MKDIR) -p $(dir $@) $(CC) $^ -o $@ $(LDFLAGS) $(SDL_LDFLAGS) -Wl,/subsystem:console @@ -235,7 +235,7 @@ $(OBJ)/%.res: %.rc # We must provide SDL2.dll with the Windows port. This is an AWFUL HACK to find it. SPACE := SPACE += -$(BIN)/sdl/SDL2.dll: +$(BIN)/SDL/SDL2.dll: @$(eval POTENTIAL_MATCHES := $(subst @@@," ",$(patsubst %,%/SDL2.dll,$(subst ;,$(SPACE),$(subst $(SPACE),@@@,$(lib)))))) @$(eval MATCH := $(shell ls $(POTENTIAL_MATCHES) 2> NUL | head -n 1)) cp "$(MATCH)" $@ @@ -253,7 +253,7 @@ $(BIN)/tester/sameboy_tester.exe: $(CORE_OBJECTS) $(SDL_OBJECTS) -@$(MKDIR) -p $(dir $@) $(CC) $^ -o $@ $(LDFLAGS) -Wl,/subsystem:console -$(BIN)/sdl/%.bin $(BIN)/tester/%.bin: $(BOOTROMS_DIR)/%.bin +$(BIN)/SDL/%.bin $(BIN)/tester/%.bin: $(BOOTROMS_DIR)/%.bin -@$(MKDIR) -p $(dir $@) cp -f $^ $@ @@ -261,10 +261,13 @@ $(BIN)/SameBoy.app/Contents/Resources/%.bin: $(BOOTROMS_DIR)/%.bin -@$(MKDIR) -p $(dir $@) cp -f $^ $@ -$(BIN)/sdl/LICENSE: LICENSE +$(BIN)/SDL/LICENSE: LICENSE cp -f $^ $@ -$(BIN)/sdl/registers.sym: Misc/registers.sym +$(BIN)/SDL/registers.sym: Misc/registers.sym + cp -f $^ $@ + +$(BIN)/SDL/drop.bmp: SDL/drop.bmp cp -f $^ $@ # Boot ROMs diff --git a/SDL/drop.bmp b/SDL/drop.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fbdc3748735458d782bf91e36ce42b8838b9bfb0 GIT binary patch literal 69176 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 3) { -usage: - fprintf(stderr, "Usage: %s [--dmg] rom\n", argv[0]); - exit(1); +restart: + if (GB_is_inited(&gb)) { + GB_switch_model_and_reset(&gb, !dmg); } - - if (argc == 3) { - if (strcmp(argv[1], "--dmg") == 0) { - dmg = true; + else { + if (dmg) { + GB_init(&gb); } else { - goto usage; + GB_init_cgb(&gb); } + + GB_set_vblank_callback(&gb, (GB_vblank_callback_t) vblank); + GB_set_pixels_output(&gb, pixels); + GB_set_rgb_encode_callback(&gb, rgb_encode); + GB_set_sample_rate(&gb, have_aspec.freq); } - - + if (dmg) { - GB_init(&gb); if (GB_load_boot_rom(&gb, executable_relative_path("dmg_boot.bin"))) { perror("Failed to load boot ROM"); exit(1); } } else { - GB_init_cgb(&gb); if (GB_load_boot_rom(&gb, executable_relative_path("cgb_boot.bin"))) { perror("Failed to load boot ROM"); exit(1); } } - - filename = argv[argc - 1]; - + if (GB_load_rom(&gb, filename)) { perror("Failed to load ROM"); exit(1); } - - signal(SIGINT, debugger_interrupt); - - SDL_Init( SDL_INIT_EVERYTHING ); - - window = SDL_CreateWindow("SameBoy v" xstr(VERSION), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, - 160, 144, SDL_WINDOW_OPENGL); - renderer = SDL_CreateRenderer(window, -1, 0); - - texture = SDL_CreateTexture(renderer, SDL_GetWindowPixelFormat(window), SDL_TEXTUREACCESS_STREAMING, 160, 144); - - pixel_format = SDL_AllocFormat(SDL_GetWindowPixelFormat(window)); - - /* Configure Screen */ - GB_set_vblank_callback(&gb, (GB_vblank_callback_t) vblank); - GB_set_pixels_output(&gb, pixels); - GB_set_rgb_encode_callback(&gb, rgb_encode); - size_t path_length = strlen(filename); - + /* Configure battery */ char battery_save_path[path_length + 5]; /* At the worst case, size is strlen(path) + 4 bytes for .sav + NULL */ replace_extension(filename, path_length, battery_save_path, ".sav"); battery_save_path_ptr = battery_save_path; GB_load_battery(&gb, battery_save_path); - + /* Configure symbols */ GB_debugger_load_symbol_file(&gb, executable_relative_path("registers.sym")); char symbols_path[path_length + 5]; replace_extension(filename, path_length, symbols_path, ".sym"); GB_debugger_load_symbol_file(&gb, symbols_path); - - /* Configure Audio */ - SDL_AudioSpec want, have; - SDL_memset(&want, 0, sizeof(want)); - want.freq = AUDIO_FREQUENCY; - want.format = AUDIO_S16SYS; - want.channels = 2; - want.samples = 512; - want.callback = audio_callback; - want.userdata = &gb; - SDL_OpenAudio(&want, &have); - GB_set_sample_rate(&gb, have.freq); - /* Start Audio */ - SDL_PauseAudio(false); - /* Run emulation */ while (true) { GB_run(&gb); @@ -362,7 +345,7 @@ usage: else { GB_save_state(&gb, save_path); } - break; + break; } case GB_SDL_RESET_COMMAND: @@ -371,8 +354,100 @@ usage: case GB_SDL_NO_COMMAND: break; + + case GB_SDL_NEW_FILE_COMMAND: + pending_command = GB_SDL_NO_COMMAND; + goto restart; + + case GB_SDL_TOGGLE_MODEL_COMMAND: + dmg = !dmg; + pending_command = GB_SDL_NO_COMMAND; + goto restart; } pending_command = GB_SDL_NO_COMMAND; } } + +int main(int argc, char **argv) +{ +#define str(x) #x +#define xstr(x) str(x) + fprintf(stderr, "SameBoy v" xstr(VERSION) "\n"); + if (argc > 3) { +usage: + fprintf(stderr, "Usage: %s [--dmg] [rom]\n", argv[0]); + exit(1); + } + + for (unsigned i = 1; i < argc; i++) { + if (strcmp(argv[i], "--dmg") == 0) { + if (dmg) { + goto usage; + } + dmg = true; + } + else if (!filename) { + filename = argv[i]; + } + else { + goto usage; + } + } + + signal(SIGINT, debugger_interrupt); + + SDL_Init( SDL_INIT_EVERYTHING ); + + window = SDL_CreateWindow("SameBoy v" xstr(VERSION), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, + 160, 144, SDL_WINDOW_OPENGL); + renderer = SDL_CreateRenderer(window, -1, 0); + + texture = SDL_CreateTexture(renderer, SDL_GetWindowPixelFormat(window), SDL_TEXTUREACCESS_STREAMING, 160, 144); + + pixel_format = SDL_AllocFormat(SDL_GetWindowPixelFormat(window)); + + /* Configure Audio */ + memset(&want_aspec, 0, sizeof(want_aspec)); + want_aspec.freq = AUDIO_FREQUENCY; + want_aspec.format = AUDIO_S16SYS; + want_aspec.channels = 2; + want_aspec.samples = 2048; + want_aspec.callback = audio_callback; + want_aspec.userdata = &gb; + SDL_OpenAudio(&want_aspec, &have_aspec); + + /* Start Audio */ + SDL_PauseAudio(false); + + SDL_EventState(SDL_DROPFILE, SDL_ENABLE); + + if (filename == NULL) { + /* Draw the "Drop file" screen */ + SDL_Surface *drop_backround = SDL_LoadBMP(executable_relative_path("drop.bmp")); + SDL_Surface *drop_converted = SDL_ConvertSurface(drop_backround, pixel_format, 0); + SDL_LockSurface(drop_converted); + SDL_UpdateTexture(texture, NULL, drop_converted->pixels, drop_converted->pitch); + SDL_RenderClear(renderer); + SDL_RenderCopy(renderer, texture, NULL, NULL); + SDL_RenderPresent(renderer); + SDL_FreeSurface(drop_converted); + SDL_FreeSurface(drop_backround) + ; + SDL_Event event; + while (SDL_WaitEvent(&event)) + { + if (event.type == SDL_QUIT) { + exit(0); + } + else if (event.type == SDL_DROPFILE) { + filename = event.drop.file; + should_free_filename = true; + break; + } + } + } + + run(); // Never returns + return 0; +}