Mercurial > repos > blastem
annotate blastem.c @ 2640:c30e5548154f
Get sync to audio working in emscripten
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Wed, 26 Feb 2025 22:55:42 -0800 |
parents | c768bbd912f1 |
children | 99297d5f4c5d |
rev | line source |
---|---|
467
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
464
diff
changeset
|
1 /* |
1018
dba8c630bdbf
Update changelog and version number for 0.4.0 release
Michael Pavone <pavone@retrodev.com>
parents:
1017
diff
changeset
|
2 Copyright 2013-2016 Michael Pavone |
469
5f3344d0d42f
Fix argument handling so that the rom filename does not need to be specified first
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
3 This file is part of BlastEm. |
467
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
464
diff
changeset
|
4 BlastEm is free software distributed under the terms of the GNU General Public License version 3 or greater. See COPYING for full license text. |
140af5509ce7
Added copyright notice to source files and added GPL license text in COPYING
Mike Pavone <pavone@retrodev.com>
parents:
464
diff
changeset
|
5 */ |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
6 #include <stdio.h> |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
7 #include <stdlib.h> |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
8 #include <string.h> |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
9 #include <ctype.h> |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
10 |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
11 #include "system.h" |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
12 #include "68kinst.h" |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
13 #include "mem.h" |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
14 #include "vdp.h" |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
15 #include "render.h" |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
16 #include "genesis.h" |
515
1495179d6737
Initial GDB remote debugging support. Lacks some features, but breakpoints and basic inspection of registers and memory work.
Mike Pavone <pavone@retrodev.com>
parents:
510
diff
changeset
|
17 #include "gdb_remote.h" |
451
b7c3b2d22858
Added support for saving savestates. Added gst savestate format test harness
Mike Pavone <pavone@retrodev.com>
parents:
447
diff
changeset
|
18 #include "gst.h" |
496
6fc71114d145
Extract function to determine executable directory from load_config so it can be used elsewhere
Mike Pavone <pavone@retrodev.com>
parents:
488
diff
changeset
|
19 #include "util.h" |
2262
bc68560b4a04
Fix bug when loading cue sheet without leading path
Michael Pavone <pavone@retrodev.com>
parents:
2257
diff
changeset
|
20 #include "paths.h" |
764
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
21 #include "romdb.h" |
832
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
22 #include "terminal.h" |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
23 #include "arena.h" |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
24 #include "config.h" |
1583
430dd12e4010
Refactor to split device bindings from IO emulation code
Michael Pavone <pavone@retrodev.com>
parents:
1582
diff
changeset
|
25 #include "bindings.h" |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
26 #include "menu.h" |
1531
092675db4f37
Add support for loading ROMs from zip files
Michael Pavone <pavone@retrodev.com>
parents:
1529
diff
changeset
|
27 #include "zip.h" |
2114
2449c88cea36
Enhance support for CUE files and add initial support for cdrdao TOC files
Michael Pavone <pavone@retrodev.com>
parents:
2083
diff
changeset
|
28 #include "cdimage.h" |
1946 | 29 #include "event_log.h" |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
30 #ifndef DISABLE_NUKLEAR |
1474
c5c022c7aa54
Initial work on Nuklear-based UI
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
31 #include "nuklear_ui/blastem_nuklear.h" |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
32 #endif |
2600
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
33 #ifdef __EMSCRIPTEN__ |
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
34 #include <emscripten.h> |
2640
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
35 #include "render_audio.h" |
2600
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
36 #endif |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
37 |
2545
c076a96f1668
Get CD titles sort of working in libretro target
Michael Pavone <pavone@retrodev.com>
parents:
2521
diff
changeset
|
38 #include "version.inc" |
464 | 39 |
860
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
40 #ifdef __ANDROID__ |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
41 #define FULLSCREEN_DEFAULT 1 |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
42 #else |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
43 #define FULLSCREEN_DEFAULT 0 |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
44 #endif |
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
45 |
215
2b1c2c28b261
Added headless flag to avoid initializing SDL and opening a window when running tests.
Mike Pavone <pavone@retrodev.com>
parents:
211
diff
changeset
|
46 int headless = 0; |
505
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
47 int exit_after = 0; |
265
c6d12878ea93
Add -n flag for disabling the Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
264
diff
changeset
|
48 int z80_enabled = 1; |
356
79e4b466e7d0
Get rid of debug puts and limit based on audio rather than frame rate by default.
Mike Pavone <pavone@retrodev.com>
parents:
354
diff
changeset
|
49 int frame_limit = 0; |
1428
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
50 uint8_t use_native_states = 1; |
215
2b1c2c28b261
Added headless flag to avoid initializing SDL and opening a window when running tests.
Mike Pavone <pavone@retrodev.com>
parents:
211
diff
changeset
|
51 |
430
7f84090ab1cd
Add config file parser and default config file
Mike Pavone <pavone@retrodev.com>
parents:
425
diff
changeset
|
52 tern_node * config; |
7f84090ab1cd
Add config file parser and default config file
Mike Pavone <pavone@retrodev.com>
parents:
425
diff
changeset
|
53 |
198
209a37eed3e7
Add support for breaking into the debugger while game is running
Mike Pavone <pavone@retrodev.com>
parents:
197
diff
changeset
|
54 int break_on_sync = 0; |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
55 char *save_state_path; |
767
ea525f600b1d
SRAM detection from ROM header is no working correctly again
Michael Pavone <pavone@retrodev.com>
parents:
766
diff
changeset
|
56 char * save_filename; |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
57 system_header *current_system; |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
58 system_header *menu_system; |
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
59 system_header *game_system; |
767
ea525f600b1d
SRAM detection from ROM header is no working correctly again
Michael Pavone <pavone@retrodev.com>
parents:
766
diff
changeset
|
60 void persist_save() |
351
2f264d2a60c2
Support for SRAM with SEGA mapper. Half-finished support for SRAM without SEGA mapper.
Mike Pavone <pavone@retrodev.com>
parents:
346
diff
changeset
|
61 { |
2289
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
62 if (!game_system || !game_system->persist_save) { |
1009
883fe974f72b
Fix bug in which save RAM/EEPROM was not persisted correctly if the emulator is exited via the menu rather than the X button in the title bar
Michael Pavone <pavone@retrodev.com>
parents:
1008
diff
changeset
|
63 return; |
883fe974f72b
Fix bug in which save RAM/EEPROM was not persisted correctly if the emulator is exited via the menu rather than the X button in the title bar
Michael Pavone <pavone@retrodev.com>
parents:
1008
diff
changeset
|
64 } |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
65 game_system->persist_save(game_system); |
351
2f264d2a60c2
Support for SRAM with SEGA mapper. Half-finished support for SRAM without SEGA mapper.
Mike Pavone <pavone@retrodev.com>
parents:
346
diff
changeset
|
66 } |
2f264d2a60c2
Support for SRAM with SEGA mapper. Half-finished support for SRAM without SEGA mapper.
Mike Pavone <pavone@retrodev.com>
parents:
346
diff
changeset
|
67 |
764
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
68 char *title; |
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
69 void update_title(char *rom_name) |
340
58a085cfc6bd
Set window title based on ROM header name
Mike Pavone <pavone@retrodev.com>
parents:
338
diff
changeset
|
70 { |
764
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
71 if (title) { |
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
72 free(title); |
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
73 title = NULL; |
340
58a085cfc6bd
Set window title based on ROM header name
Mike Pavone <pavone@retrodev.com>
parents:
338
diff
changeset
|
74 } |
764
bb60259e8edf
Initial work on ROM database
Michael Pavone <pavone@retrodev.com>
parents:
753
diff
changeset
|
75 title = alloc_concat(rom_name, " - BlastEm"); |
874
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
76 render_update_caption(title); |
340
58a085cfc6bd
Set window title based on ROM header name
Mike Pavone <pavone@retrodev.com>
parents:
338
diff
changeset
|
77 } |
58a085cfc6bd
Set window title based on ROM header name
Mike Pavone <pavone@retrodev.com>
parents:
338
diff
changeset
|
78 |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
79 static char *get_save_dir(system_media *media) |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
80 { |
1326
071e761bcdcf
Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in
Michael Pavone <pavone@retrodev.com>
parents:
1295
diff
changeset
|
81 char *savedir_template = tern_find_path(config, "ui\0save_path\0", TVAL_PTR).ptrval; |
1295
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
82 if (!savedir_template) { |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
83 savedir_template = "$USERDATA/blastem/$ROMNAME"; |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
84 } |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
85 tern_node *vars = tern_insert_ptr(NULL, "ROMNAME", media->name); |
1850
30f2821ffd65
Allow rom directory and rom name in screenshot path. Allow rom name in screenshot name. Remove ability for path variables to contain underscores
Michael Pavone <pavone@retrodev.com>
parents:
1815
diff
changeset
|
86 vars = tern_insert_ptr(vars, "ROMDIR", media->dir); |
1295
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
87 vars = tern_insert_ptr(vars, "HOME", get_home_dir()); |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
88 vars = tern_insert_ptr(vars, "EXEDIR", get_exe_dir()); |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
89 vars = tern_insert_ptr(vars, "USERDATA", (char *)get_userdata_dir()); |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
90 char *save_dir = replace_vars(savedir_template, vars, 1); |
96ad1b9bbb3a
Make save directory configurable. Satisfies ticket:4
Michael Pavone <pavone@retrodev.com>
parents:
1223
diff
changeset
|
91 tern_free(vars); |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
92 if (!ensure_dir_exists(save_dir)) { |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
93 warning("Failed to create save directory %s\n", save_dir); |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
94 } |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
95 return save_dir; |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
96 } |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
97 |
2027
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
98 const char *get_save_fname(uint8_t save_type) |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
99 { |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
100 switch(save_type) |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
101 { |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
102 case SAVE_I2C: return "save.eeprom"; |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
103 case SAVE_NOR: return "save.nor"; |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
104 case SAVE_HBPT: return "save.hbpt"; |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
105 default: return "save.sram"; |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
106 } |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
107 } |
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
108 |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
109 void setup_saves(system_media *media, system_header *context) |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
110 { |
2289
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
111 if (!context->load_save) { |
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
112 // system doesn't support saves |
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
113 return; |
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
114 } |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
115 static uint8_t persist_save_registered; |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
116 rom_info *info = &context->info; |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
117 char *save_dir = get_save_dir(info->is_save_lock_on ? media->chain : media); |
2027
0f54a898db03
Implement Heartbeat Personal Trainer peripheral and add ROM DB entry for Outback Joey
Michael Pavone <pavone@retrodev.com>
parents:
1980
diff
changeset
|
118 char const *parts[] = {save_dir, PATH_SEP, get_save_fname(info->save_type)}; |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
119 free(save_filename); |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
120 save_filename = alloc_concat_m(3, parts); |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
121 if (info->is_save_lock_on) { |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
122 //initial save dir was calculated based on lock-on cartridge because that's where the save device is |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
123 //save directory used for save states should still be located in the normal place |
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
124 free(save_dir); |
1592
31effaadf877
Fix some memory errors (mostly leaks) identified by valgrind
Michael Pavone <pavone@retrodev.com>
parents:
1583
diff
changeset
|
125 parts[0] = save_dir = get_save_dir(media); |
1412
909c72c4e5a1
Load SRAM/EEPROM from lock-on cart directory if the lock-on cart is the one with the save device
Michael Pavone <pavone@retrodev.com>
parents:
1402
diff
changeset
|
126 } |
1428
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
127 if (use_native_states || context->type != SYSTEM_GENESIS) { |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
128 parts[2] = "quicksave.state"; |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
129 } else { |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
130 parts[2] = "quicksave.gst"; |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
131 } |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
132 free(save_state_path); |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
133 save_state_path = alloc_concat_m(3, parts); |
956
f5550cdffe49
Saving the save directory in the rom_info struct didn't make sense. It should be in the console context.
Michael Pavone <pavone@retrodev.com>
parents:
955
diff
changeset
|
134 context->save_dir = save_dir; |
2083
372625dd9590
Persist BRAM to file. Load BIOS relative to blastem directory
Michael Pavone <pavone@retrodev.com>
parents:
2076
diff
changeset
|
135 if (info->save_type != SAVE_NONE || context->type == SYSTEM_SEGACD |
372625dd9590
Persist BRAM to file. Load BIOS relative to blastem directory
Michael Pavone <pavone@retrodev.com>
parents:
2076
diff
changeset
|
136 || (context->type == SYSTEM_GENESIS && info->wants_cd) |
372625dd9590
Persist BRAM to file. Load BIOS relative to blastem directory
Michael Pavone <pavone@retrodev.com>
parents:
2076
diff
changeset
|
137 ) { |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
138 context->load_save(context); |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
139 if (!persist_save_registered) { |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
140 atexit(persist_save); |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
141 persist_save_registered = 1; |
956
f5550cdffe49
Saving the save directory in the rom_info struct didn't make sense. It should be in the console context.
Michael Pavone <pavone@retrodev.com>
parents:
955
diff
changeset
|
142 } |
f5550cdffe49
Saving the save directory in the rom_info struct didn't make sense. It should be in the console context.
Michael Pavone <pavone@retrodev.com>
parents:
955
diff
changeset
|
143 } |
955
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
144 } |
229c23b3ab73
Switch to storing SRAM/EEPROM and save states in a per-game directory rather than next to the ROM (for SRAM/EEPROM) or in the current working directory (for save states)
Michael Pavone <pavone@retrodev.com>
parents:
953
diff
changeset
|
145 |
2640
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
146 static uint8_t menu; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
147 static uint8_t use_nuklear; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
148 #ifdef __EMSCRIPTEN__ |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
149 void handle_frame_presented(void) |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
150 { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
151 if (current_system) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
152 current_system->request_exit(current_system); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
153 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
154 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
155 |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
156 void browser_main_loop(void) |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
157 { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
158 static uint8_t system_started; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
159 #ifndef DISABLE_NUKLEAR |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
160 static uint8_t was_menu; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
161 if (use_nuklear) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
162 if (menu && !was_menu) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
163 ui_enter(); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
164 } else if (!menu && was_menu) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
165 ui_exit(); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
166 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
167 if (menu) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
168 render_update_display(); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
169 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
170 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
171 #endif |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
172 if (!current_system && game_system) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
173 current_system = game_system; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
174 menu = 0; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
175 #ifndef DISABLE_NUKLEAR |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
176 was_menu = 0; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
177 ui_exit(); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
178 #endif |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
179 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
180 if (current_system) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
181 if (system_started && render_is_audio_sync()) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
182 if (all_sources_ready()) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
183 return; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
184 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
185 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
186 if (current_system->next_rom) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
187 char *next_rom = current_system->next_rom; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
188 current_system->next_rom = NULL; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
189 init_system_with_media(next_rom, 0); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
190 system_started = 0; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
191 menu = 0; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
192 current_system = game_system; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
193 } else if (!menu) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
194 if (system_started) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
195 current_system->resume_context(current_system); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
196 } else { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
197 system_started = 1; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
198 current_system->start_context(current_system, NULL); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
199 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
200 if (current_system->force_release) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
201 menu = 1; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
202 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
203 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
204 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
205 |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
206 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
207 |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
208 void setup_main_loop(void) |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
209 { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
210 //can't use render_is_audio_sync since we haven't called render_init/render_config_updated yet |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
211 char *sync = tern_find_path_default(config, "system\0sync_source\0", (tern_val){.ptrval = "audio"}, TVAL_PTR).ptrval; |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
212 emscripten_cancel_main_loop(); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
213 if (!strcmp("video", sync)) { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
214 render_set_audio_full_fun(NULL); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
215 render_set_frame_presented_fun(handle_frame_presented); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
216 emscripten_set_main_loop(browser_main_loop, 0, 0); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
217 } else { |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
218 render_set_frame_presented_fun(NULL); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
219 render_set_audio_full_fun(handle_frame_presented); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
220 emscripten_set_main_loop(browser_main_loop, 1, 0); //dummy fps value, will be overridden by a call to emscripten_set_main_loop_timing |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
221 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
222 } |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
223 #endif |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
224 |
1573
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
225 void apply_updated_config(void) |
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
226 { |
2640
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
227 #ifdef __EMSCRIPTEN__ |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
228 setup_main_loop(); |
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
229 #endif |
1573
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
230 render_config_updated(); |
2314
59fd8aa352e2
Apply binding changes after a config change in UI
Michael Pavone <pavone@retrodev.com>
parents:
2289
diff
changeset
|
231 set_bindings(); |
59fd8aa352e2
Apply binding changes after a config change in UI
Michael Pavone <pavone@retrodev.com>
parents:
2289
diff
changeset
|
232 update_pad_bindings(); |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
233 if (current_system && current_system->config_updated) { |
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
234 current_system->config_updated(current_system); |
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
235 } |
1573
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
236 } |
a051d8ee4528
Only save config file if something has changed. Re-initialize audio and video with new settings if config has changed
Michael Pavone <pavone@retrodev.com>
parents:
1550
diff
changeset
|
237 |
2430
fb8d6ebf9d5f
Fix crash when loading new ROM via drag/drop when existing ROM has lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2428
diff
changeset
|
238 static system_media cart, lock_on; |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
239 static void on_drag_drop(char *filename) |
1397
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
240 { |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
241 if (current_system) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
242 if (current_system->next_rom) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
243 free(current_system->next_rom); |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
244 } |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
245 current_system->next_rom = strdup(filename); |
1980
81df9aa2de9b
Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents:
1975
diff
changeset
|
246 system_request_exit(current_system, 1); |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
247 if (menu_system && menu_system->type == SYSTEM_GENESIS) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
248 genesis_context *gen = (genesis_context *)menu_system; |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
249 if (gen->extra) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
250 menu_context *menu = gen->extra; |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
251 menu->external_game_load = 1; |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
252 } |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
253 } |
2430
fb8d6ebf9d5f
Fix crash when loading new ROM via drag/drop when existing ROM has lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2428
diff
changeset
|
254 cart.chain = NULL; |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
255 } else { |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
256 init_system_with_media(filename, SYSTEM_UNKNOWN); |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
257 } |
1581
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
258 #ifndef DISABLE_NUKLEAR |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
259 if (is_nuklear_active()) { |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
260 show_play_view(); |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
261 } |
7121daaa48c2
Fix drag and drop when using Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1573
diff
changeset
|
262 #endif |
1397
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
263 } |
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
264 |
1850
30f2821ffd65
Allow rom directory and rom name in screenshot path. Allow rom name in screenshot name. Remove ability for path variables to contain underscores
Michael Pavone <pavone@retrodev.com>
parents:
1815
diff
changeset
|
265 const system_media *current_media(void) |
30f2821ffd65
Allow rom directory and rom name in screenshot path. Allow rom name in screenshot name. Remove ability for path variables to contain underscores
Michael Pavone <pavone@retrodev.com>
parents:
1815
diff
changeset
|
266 { |
30f2821ffd65
Allow rom directory and rom name in screenshot path. Allow rom name in screenshot name. Remove ability for path variables to contain underscores
Michael Pavone <pavone@retrodev.com>
parents:
1815
diff
changeset
|
267 return &cart; |
30f2821ffd65
Allow rom directory and rom name in screenshot path. Allow rom name in screenshot name. Remove ability for path variables to contain underscores
Michael Pavone <pavone@retrodev.com>
parents:
1815
diff
changeset
|
268 } |
30f2821ffd65
Allow rom directory and rom name in screenshot path. Allow rom name in screenshot name. Remove ability for path variables to contain underscores
Michael Pavone <pavone@retrodev.com>
parents:
1815
diff
changeset
|
269 |
1438
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
270 void reload_media(void) |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
271 { |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
272 if (!current_system || !cart.orig_path) { |
1582
a74db49fa6b1
Added null check to reload_media
Michael Pavone <pavone@retrodev.com>
parents:
1581
diff
changeset
|
273 return; |
a74db49fa6b1
Added null check to reload_media
Michael Pavone <pavone@retrodev.com>
parents:
1581
diff
changeset
|
274 } |
1438
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
275 if (current_system->next_rom) { |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
276 free(current_system->next_rom); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
277 } |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
278 current_system->next_rom = cart.orig_path; |
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
279 cart.orig_path = NULL; |
2401
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
280 if (cart.chain) { |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
281 load_media(cart.chain->orig_path, cart.chain, NULL); |
2401
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
282 } |
1980
81df9aa2de9b
Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents:
1975
diff
changeset
|
283 system_request_exit(current_system, 1); |
1438
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
284 } |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
285 |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
286 void lockon_media(char *lock_on_path) |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
287 { |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
288 free(lock_on.dir); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
289 free(lock_on.name); |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
290 free(lock_on.extension); |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
291 free(lock_on.orig_path); |
2401
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
292 if (lock_on_path) { |
2544
99e59fdddbc3
Better cassette tape UX
Michael Pavone <pavone@retrodev.com>
parents:
2521
diff
changeset
|
293 if (!current_system || !current_system->lockon_change) { |
99e59fdddbc3
Better cassette tape UX
Michael Pavone <pavone@retrodev.com>
parents:
2521
diff
changeset
|
294 cart.chain = NULL; |
99e59fdddbc3
Better cassette tape UX
Michael Pavone <pavone@retrodev.com>
parents:
2521
diff
changeset
|
295 reload_media(); |
99e59fdddbc3
Better cassette tape UX
Michael Pavone <pavone@retrodev.com>
parents:
2521
diff
changeset
|
296 } |
2401
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
297 cart.chain = &lock_on; |
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
298 load_media(lock_on_path, &lock_on, NULL); |
2544
99e59fdddbc3
Better cassette tape UX
Michael Pavone <pavone@retrodev.com>
parents:
2521
diff
changeset
|
299 if (current_system && current_system->lockon_change) { |
99e59fdddbc3
Better cassette tape UX
Michael Pavone <pavone@retrodev.com>
parents:
2521
diff
changeset
|
300 current_system->lockon_change(current_system, &lock_on); |
99e59fdddbc3
Better cassette tape UX
Michael Pavone <pavone@retrodev.com>
parents:
2521
diff
changeset
|
301 } |
2401
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
302 } else { |
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
303 lock_on.dir = NULL; |
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
304 lock_on.name = NULL; |
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
305 lock_on.extension = NULL; |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
306 lock_on.orig_path = NULL; |
2401
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
307 cart.chain = NULL; |
34b4ff091891
Fix crash when loading a subsequent ROM after lock-on
Michael Pavone <pavone@retrodev.com>
parents:
2314
diff
changeset
|
308 } |
1438
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
309 } |
e2bd03ed3190
Allow reloading current ROM with a hotkey (default F5) and allow locking on a cartridge via menu
Michael Pavone <pavone@retrodev.com>
parents:
1428
diff
changeset
|
310 |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
311 static uint32_t opts = 0; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
312 static uint8_t force_region = 0; |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
313 void init_system_with_media(char *path, system_type force_stype) |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
314 { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
315 if (game_system) { |
2289
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
316 if (game_system->persist_save) { |
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
317 game_system->persist_save(game_system); |
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
318 } |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
319 //swap to game context arena and mark all allocated pages in it free |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
320 if (current_system == menu_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
321 current_system->arena = set_current_arena(game_system->arena); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
322 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
323 mark_all_free(); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
324 game_system->free_context(game_system); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
325 } else if(current_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
326 //start a new arena and save old one in suspended system context |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
327 current_system->arena = start_new_arena(); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
328 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
329 free(cart.dir); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
330 free(cart.name); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
331 free(cart.extension); |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
332 free(cart.orig_path); |
1692 | 333 system_type stype = SYSTEM_UNKNOWN; |
334 if (!(cart.size = load_media(path, &cart, &stype))) { | |
335 fatal_error("Failed to open %s for reading\n", path); | |
336 } | |
2053 | 337 |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
338 if (force_stype != SYSTEM_UNKNOWN) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
339 stype = force_stype; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
340 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
341 if (stype == SYSTEM_UNKNOWN) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
342 stype = detect_system_type(&cart); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
343 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
344 if (stype == SYSTEM_UNKNOWN) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
345 fatal_error("Failed to detect system type for %s\n", path); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
346 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
347 //allocate new system context |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
348 game_system = alloc_config_system(stype, &cart, opts, force_region); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
349 if (!game_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
350 fatal_error("Failed to configure emulated machine for %s\n", path); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
351 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
352 if (menu_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
353 menu_system->next_context = game_system; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
354 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
355 game_system->next_context = menu_system; |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
356 setup_saves(&cart, game_system); |
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
357 update_title(game_system->info.name); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
358 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
359 |
1946 | 360 char *parse_addr_port(char *arg) |
361 { | |
362 while (*arg && *arg != ':') { | |
363 ++arg; | |
364 } | |
365 if (!*arg) { | |
366 return NULL; | |
367 } | |
368 char *end; | |
369 int port = strtol(arg + 1, &end, 10); | |
370 if (port && !*end) { | |
371 *arg = 0; | |
372 return arg + 1; | |
373 } | |
374 return NULL; | |
375 } | |
376 | |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
377 int main(int argc, char ** argv) |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
378 { |
496
6fc71114d145
Extract function to determine executable directory from load_config so it can be used elsewhere
Mike Pavone <pavone@retrodev.com>
parents:
488
diff
changeset
|
379 set_exe_str(argv[0]); |
6fc71114d145
Extract function to determine executable directory from load_config so it can be used elsewhere
Mike Pavone <pavone@retrodev.com>
parents:
488
diff
changeset
|
380 config = load_config(); |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
381 int width = -1; |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
382 int height = -1; |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
383 int debug = 0; |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
384 int loaded = 0; |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
385 system_type stype = SYSTEM_UNKNOWN, force_stype = SYSTEM_UNKNOWN; |
469
5f3344d0d42f
Fix argument handling so that the rom filename does not need to be specified first
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
386 char * romfname = NULL; |
425
8b3ae850d1c4
Forgot to null initialize the statfile pointer
Mike Pavone <pavone@retrodev.com>
parents:
424
diff
changeset
|
387 char * statefile = NULL; |
1955
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
388 char *reader_addr = NULL, *reader_port = NULL; |
1946 | 389 event_reader reader = {0}; |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
390 debugger_type dtype = DEBUGGER_NATIVE; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
391 uint8_t start_in_debugger = 0; |
860
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
392 uint8_t fullscreen = FULLSCREEN_DEFAULT, use_gl = 1; |
885
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
393 uint8_t debug_target = 0; |
1946 | 394 char *port; |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
395 for (int i = 1; i < argc; i++) { |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
396 if (argv[i][0] == '-') { |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
397 switch(argv[i][1]) { |
505
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
398 case 'b': |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
399 i++; |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
400 if (i >= argc) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
401 fatal_error("-b must be followed by a frame count\n"); |
505
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
402 } |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
403 headless = 1; |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
404 exit_after = atoi(argv[i]); |
b7b7a1cab44a
The local clone on my laptop got messed up and some changes had not been pushed. This commit represents the status of the working copy from that clone. It unfortunately contains some changes that I did not intend to commit yet, but this seems like the best option at the moment.
Michael Pavone <pavone@retrodev.com>
parents:
501
diff
changeset
|
405 break; |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
406 case 'd': |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
407 start_in_debugger = 1; |
885
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
408 //allow debugging the menu |
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
409 if (argv[i][2] == 'm') { |
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
410 debug_target = 1; |
e3f5ec336432
Allow menu ROM to be debugged
Michael Pavone <pavone@retrodev.com>
parents:
884
diff
changeset
|
411 } |
515
1495179d6737
Initial GDB remote debugging support. Lacks some features, but breakpoints and basic inspection of registers and memory work.
Mike Pavone <pavone@retrodev.com>
parents:
510
diff
changeset
|
412 break; |
1495179d6737
Initial GDB remote debugging support. Lacks some features, but breakpoints and basic inspection of registers and memory work.
Mike Pavone <pavone@retrodev.com>
parents:
510
diff
changeset
|
413 case 'D': |
1495179d6737
Initial GDB remote debugging support. Lacks some features, but breakpoints and basic inspection of registers and memory work.
Mike Pavone <pavone@retrodev.com>
parents:
510
diff
changeset
|
414 gdb_remote_init(); |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
415 dtype = DEBUGGER_GDB; |
1164
21df13266e6a
Restore functionality of the -D flag for GDB remote debugging
Michael Pavone <pavone@retrodev.com>
parents:
1140
diff
changeset
|
416 start_in_debugger = 1; |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
417 break; |
1946 | 418 case 'e': |
419 i++; | |
420 if (i >= argc) { | |
421 fatal_error("-e must be followed by a file name\n"); | |
422 } | |
423 port = parse_addr_port(argv[i]); | |
424 if (port) { | |
425 event_log_tcp(argv[i], port); | |
426 } else { | |
427 event_log_file(argv[i]); | |
428 } | |
429 break; | |
338
5c34a9c39394
Re-enable frame limit, but add a command line flag to disable it
Mike Pavone <pavone@retrodev.com>
parents:
336
diff
changeset
|
430 case 'f': |
860
213c3b5160d0
Default to fullscreen on Android since windowed mode does not make sense there
Michael Pavone <pavone@retrodev.com>
parents:
846
diff
changeset
|
431 fullscreen = !fullscreen; |
338
5c34a9c39394
Re-enable frame limit, but add a command line flag to disable it
Mike Pavone <pavone@retrodev.com>
parents:
336
diff
changeset
|
432 break; |
488
32f053ad9b02
Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents:
487
diff
changeset
|
433 case 'g': |
501
e1355aa80f4d
Use OpenGL by default. Add OpenGL switch to help text
Mike Pavone <pavone@retrodev.com>
parents:
496
diff
changeset
|
434 use_gl = 0; |
488
32f053ad9b02
Basic OpenGL rendering is working
Mike Pavone <pavone@retrodev.com>
parents:
487
diff
changeset
|
435 break; |
197
7c227a8ec53d
Add instruction address logging to translator and support for reading an address log to the disassembler
Mike Pavone <pavone@retrodev.com>
parents:
195
diff
changeset
|
436 case 'l': |
1113
45db303fc705
Restore 68K address logging functionality
Michael Pavone <pavone@retrodev.com>
parents:
1111
diff
changeset
|
437 opts |= OPT_ADDRESS_LOG; |
197
7c227a8ec53d
Add instruction address logging to translator and support for reading an address log to the disassembler
Mike Pavone <pavone@retrodev.com>
parents:
195
diff
changeset
|
438 break; |
464 | 439 case 'v': |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
440 info_message("blastem %s\n", BLASTEM_VERSION); |
464 | 441 return 0; |
442 break; | |
265
c6d12878ea93
Add -n flag for disabling the Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
264
diff
changeset
|
443 case 'n': |
c6d12878ea93
Add -n flag for disabling the Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
264
diff
changeset
|
444 z80_enabled = 0; |
c6d12878ea93
Add -n flag for disabling the Z80 core
Mike Pavone <pavone@retrodev.com>
parents:
264
diff
changeset
|
445 break; |
341
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
446 case 'r': |
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
447 i++; |
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
448 if (i >= argc) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
449 fatal_error("-r must be followed by region (J, U or E)\n"); |
341
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
450 } |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
451 force_region = translate_region_char(toupper(argv[i][0])); |
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
452 if (!force_region) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
453 fatal_error("'%c' is not a valid region character for the -r option\n", argv[i][0]); |
341
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
454 } |
6ad8e36de685
Support regions other than USA
Mike Pavone <pavone@retrodev.com>
parents:
340
diff
changeset
|
455 break; |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
456 case 'm': |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
457 i++; |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
458 if (i >= argc) { |
2604
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
459 fatal_error("-r must be followed by a machine type (sms, gg, sg, sc, gen, pico, copera, jag or media)\n"); |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
460 } |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
461 if (!strcmp("sms", argv[i])) { |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
462 stype = force_stype = SYSTEM_SMS; |
2604
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
463 } else if (!strcmp("gg", argv[i])) { |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
464 stype = force_stype = SYSTEM_GAME_GEAR; |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
465 } else if (!strcmp("sg", argv[i])) { |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
466 stype = force_stype = SYSTEM_SG1000; |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
467 } else if (!strcmp("sc", argv[i])) { |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
468 stype = force_stype = SYSTEM_SC3000; |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
469 } else if (!strcmp("gen", argv[i])) { |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
470 stype = force_stype = SYSTEM_GENESIS; |
2428 | 471 } else if (!strcmp("pico", argv[i])) { |
472 stype = force_stype = SYSTEM_PICO; | |
2459
cb62730d5c99
Initial work on Copera emulation
Michael Pavone <pavone@retrodev.com>
parents:
2438
diff
changeset
|
473 } else if (!strcmp("copera", argv[i])) { |
cb62730d5c99
Initial work on Copera emulation
Michael Pavone <pavone@retrodev.com>
parents:
2438
diff
changeset
|
474 stype = force_stype = SYSTEM_COPERA; |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
475 } else if (!strcmp("jag", argv[i])) { |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
476 stype = force_stype = SYSTEM_JAGUAR; |
2289
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
477 } else if (!strcmp("media", argv[i])) { |
92449b47cce8
Integrate VGM player into main blastem binary
Michael Pavone <pavone@retrodev.com>
parents:
2286
diff
changeset
|
478 stype = force_stype = SYSTEM_MEDIA_PLAYER; |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
479 } else { |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
480 fatal_error("Unrecognized machine type %s\n", argv[i]); |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
481 } |
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
482 break; |
424
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
483 case 's': |
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
484 i++; |
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
485 if (i >= argc) { |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
486 fatal_error("-s must be followed by a savestate filename\n"); |
424
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
487 } |
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
488 statefile = argv[i]; |
7e8e179116af
Add support for loading GST format savestates
Mike Pavone <pavone@retrodev.com>
parents:
422
diff
changeset
|
489 break; |
832
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
490 case 't': |
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
491 force_no_terminal(); |
0433fdd9ba66
Added a command line option to force BlastEm to not open a new terminal even if it detects that stdin/out are not terminals
Michael Pavone <pavone@retrodev.com>
parents:
819
diff
changeset
|
492 break; |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
405
diff
changeset
|
493 case 'y': |
1113
45db303fc705
Restore 68K address logging functionality
Michael Pavone <pavone@retrodev.com>
parents:
1111
diff
changeset
|
494 opts |= YM_OPT_WAVE_LOG; |
407
c3abc4ada43d
Add support for logging YM2612 channels to WAVE files
Mike Pavone <pavone@retrodev.com>
parents:
405
diff
changeset
|
495 break; |
1016
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
496 case 'o': { |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
497 i++; |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
498 if (i >= argc) { |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
499 fatal_error("-o must be followed by a lock on cartridge filename\n"); |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
500 } |
1472
d2d637dbacfb
Change load_rom into load_media with some interface changes in preparation for CD support
Michael Pavone <pavone@retrodev.com>
parents:
1460
diff
changeset
|
501 if (!load_media(argv[i], &lock_on, NULL)) { |
1016
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
502 fatal_error("Failed to load lock on cartridge %s\n", argv[i]); |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
503 } |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
504 cart.chain = &lock_on; |
1016
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
505 break; |
5fb64487b6e1
Very basic support for S&K lock-on. Needs more work for full functionality.
Michael Pavone <pavone@retrodev.com>
parents:
1009
diff
changeset
|
506 } |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
507 case 'h': |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
508 info_message( |
469
5f3344d0d42f
Fix argument handling so that the rom filename does not need to be specified first
Mike Pavone <pavone@retrodev.com>
parents:
467
diff
changeset
|
509 "Usage: blastem [OPTIONS] ROMFILE [WIDTH] [HEIGHT]\n" |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
510 "Options:\n" |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
511 " -h Print this help text\n" |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
512 " -r (J|U|E) Force region to Japan, US or Europe respectively\n" |
1223
a477cc22a960
Fix indentation of -m option
Michael Pavone <pavone@retrodev.com>
parents:
1201
diff
changeset
|
513 " -m MACHINE Force emulated machine type to MACHINE. Valid values are:\n" |
2604
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
514 " sms - Sega Master System/Mark III\n" |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
515 " gg - Sega Game Gear\n" |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
516 " sg - Sega SG-1000\n" |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
517 " sc - Sega SC-3000\n" |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
518 " gen - Sega Genesis/Megadrive\n" |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
519 " pico - Sega Pico\n" |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
520 " copera - Yamaha Copera\n" |
c768bbd912f1
Give sega 8-bit consoles separate system_type enum values and allow selecting them from the command line
Michael Pavone <pavone@retrodev.com>
parents:
2600
diff
changeset
|
521 " media - Media Player\n" |
1017
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
522 " -f Toggles fullscreen mode\n" |
501
e1355aa80f4d
Use OpenGL by default. Add OpenGL switch to help text
Mike Pavone <pavone@retrodev.com>
parents:
496
diff
changeset
|
523 " -g Disable OpenGL rendering\n" |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
524 " -s FILE Load a GST format savestate from FILE\n" |
1017
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
525 " -o FILE Load FILE as a lock-on cartridge\n" |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
526 " -d Enter debugger on startup\n" |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
527 " -n Disable Z80\n" |
501
e1355aa80f4d
Use OpenGL by default. Add OpenGL switch to help text
Mike Pavone <pavone@retrodev.com>
parents:
496
diff
changeset
|
528 " -v Display version number and exit\n" |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
529 " -l Log 68K code addresses (useful for assemblers)\n" |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
530 " -y Log individual YM-2612 channels to WAVE files\n" |
1946 | 531 " -e FILE Write hardware event log to FILE\n" |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
532 ); |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
533 return 0; |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
534 default: |
792
724bbec47f86
Use a new fatal_error function instead of calling fprintf and exit for fatal errors. This new function more gracefully handles the case in which BlastEm was not started from a terminal or disconnected from ther terminal (Windows).
Michael Pavone <pavone@retrodev.com>
parents:
787
diff
changeset
|
535 fatal_error("Unrecognized switch %s\n", argv[i]); |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
536 } |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
537 } else if (!loaded) { |
1955
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
538 reader_port = parse_addr_port(argv[i]); |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
539 if (reader_port) { |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
540 reader_addr = argv[i]; |
1946 | 541 } else { |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
542 romfname = strdup(argv[i]); |
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
543 if (!load_media(romfname, &cart, stype == SYSTEM_UNKNOWN ? &stype : NULL)) { |
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
544 fatal_error("Failed to open %s for reading\n", argv[i]); |
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
545 } |
463
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
546 } |
a1d298119153
Added -h help text option
Mike Pavone <pavone@retrodev.com>
parents:
458
diff
changeset
|
547 loaded = 1; |
184
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
548 } else if (width < 0) { |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
549 width = atoi(argv[i]); |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
550 } else if (height < 0) { |
ebcbdd1c4cc8
Fix a bunch of bugs in the CPU core, add a 68K debugger
Mike Pavone <pavone@retrodev.com>
parents:
166
diff
changeset
|
551 height = atoi(argv[i]); |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
552 } |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
553 } |
2053 | 554 |
1402
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
555 int def_width = 0, def_height = 0; |
1326
071e761bcdcf
Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in
Michael Pavone <pavone@retrodev.com>
parents:
1295
diff
changeset
|
556 char *config_width = tern_find_path(config, "video\0width\0", TVAL_PTR).ptrval; |
433
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
557 if (config_width) { |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
558 def_width = atoi(config_width); |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
559 } |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
560 if (!def_width) { |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
561 def_width = 640; |
ed4d0017c041
Read default render width from config file
Mike Pavone <pavone@retrodev.com>
parents:
430
diff
changeset
|
562 } |
1402
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
563 char *config_height = tern_find_path(config, "video\0height\0", TVAL_PTR).ptrval; |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
564 if (config_height) { |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
565 def_height = atoi(config_height); |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
566 } |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
567 if (!def_height) { |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
568 def_height = -1; |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
569 } |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
570 width = width < 1 ? def_width : width; |
458df351af06
Allow height to be specified in the config file and properly calculate from the aspect setting if it is not specified
Michael Pavone <pavone@retrodev.com>
parents:
1397
diff
changeset
|
571 height = height < 1 ? def_height : height; |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
572 |
1326
071e761bcdcf
Fix a deficiency in the way types were handled in my ternary tree. Fixes in which some paths that were constructed from a template with variables would sometimes get an extra garbage character thrown in
Michael Pavone <pavone@retrodev.com>
parents:
1295
diff
changeset
|
573 char *config_fullscreen = tern_find_path(config, "video\0fullscreen\0", TVAL_PTR).ptrval; |
1017
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
574 if (config_fullscreen && !strcmp("on", config_fullscreen)) { |
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
575 fullscreen = !fullscreen; |
216fa63749b3
Added documentation for lock-on support and a fullscreen config option.
Michael Pavone <pavone@retrodev.com>
parents:
1016
diff
changeset
|
576 } |
2600
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
577 #ifdef __EMSCRIPTEN__ |
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
578 config = tern_insert_path(config, "ui\0initial_path\0", (tern_val){.ptrval = strdup("/roms")}, TVAL_PTR); |
2640
c30e5548154f
Get sync to audio working in emscripten
Michael Pavone <pavone@retrodev.com>
parents:
2604
diff
changeset
|
579 setup_main_loop(); |
2600
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
580 #endif |
354
15dd6418fe67
Initial PSG support. Mostly works, noise channel is borked though.
Mike Pavone <pavone@retrodev.com>
parents:
351
diff
changeset
|
581 if (!headless) { |
1975
3701517d852c
Avoid expensive re-init from switching to external sync after render_init has been called
Michael Pavone <pavone@retrodev.com>
parents:
1958
diff
changeset
|
582 if (reader_addr) { |
3701517d852c
Avoid expensive re-init from switching to external sync after render_init has been called
Michael Pavone <pavone@retrodev.com>
parents:
1958
diff
changeset
|
583 render_set_external_sync(1); |
3701517d852c
Avoid expensive re-init from switching to external sync after render_init has been called
Michael Pavone <pavone@retrodev.com>
parents:
1958
diff
changeset
|
584 } |
1103
22e87b739ad6
WIP split of ROM loading/argument parsing from Genesis emulation code. Compiles and doesn't crash, but nothing works. Still a few too many globals as well.
Michael Pavone <pavone@retrodev.com>
parents:
1097
diff
changeset
|
585 render_init(width, height, "BlastEm", fullscreen); |
1397
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
586 render_set_drag_drop_handler(on_drag_drop); |
342
13f994c88c34
Get frame time correct and frame rate sort of correct for EUR region
Mike Pavone <pavone@retrodev.com>
parents:
341
diff
changeset
|
587 } |
1583
430dd12e4010
Refactor to split device bindings from IO emulation code
Michael Pavone <pavone@retrodev.com>
parents:
1582
diff
changeset
|
588 set_bindings(); |
2600
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
589 menu = !loaded; |
2053 | 590 |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
591 #ifndef DISABLE_NUKLEAR |
1651 | 592 use_nuklear = !headless && is_nuklear_available(); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
593 #endif |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
594 if (!loaded && !use_nuklear) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
595 //load menu |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
596 romfname = tern_find_path(config, "ui\0rom\0", TVAL_PTR).ptrval; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
597 if (!romfname) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
598 romfname = "menu.bin"; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
599 } |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
600 romfname = strdup(romfname); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
601 if (is_absolute_path(romfname)) { |
1692 | 602 if (!(cart.size = load_media(romfname, &cart, &stype))) { |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
603 fatal_error("Failed to open UI ROM %s for reading", romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
604 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
605 } else { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
606 cart.buffer = (uint16_t *)read_bundled_file(romfname, &cart.size); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
607 if (!cart.buffer) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
608 fatal_error("Failed to open UI ROM %s for reading", romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
609 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
610 uint32_t rom_size = nearest_pow2(cart.size); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
611 if (rom_size > cart.size) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
612 cart.buffer = realloc(cart.buffer, rom_size); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
613 cart.size = rom_size; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
614 } |
1692 | 615 cart.dir = path_dirname(romfname); |
616 cart.name = basename_no_extension(romfname); | |
617 cart.extension = path_extension(romfname); | |
2404
6f8400ce7a0f
Fix reload of zipped and gzipped ROMS
Michael Pavone <pavone@retrodev.com>
parents:
2401
diff
changeset
|
618 cart.orig_path = romfname; |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
619 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
620 //force system detection, value on command line is only for games not the menu |
1140
4490c9c12272
Detect system type from filename if header based methods fail. Allow overriding system type from command line.
Michael Pavone <pavone@retrodev.com>
parents:
1128
diff
changeset
|
621 stype = detect_system_type(&cart); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
622 loaded = 1; |
1128
093c19f34dfd
Detect failures to initialize a system context and report an error rather than crashing
Michael Pavone <pavone@retrodev.com>
parents:
1113
diff
changeset
|
623 } |
1428
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
624 char *state_format = tern_find_path(config, "ui\0state_format\0", TVAL_PTR).ptrval; |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
625 if (state_format && !strcmp(state_format, "gst")) { |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
626 use_native_states = 0; |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
627 } else if (state_format && strcmp(state_format, "native")) { |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
628 warning("%s is not a valid value for the ui.state_format setting. Valid values are gst and native\n", state_format); |
2540c05520f2
New savestates are working. New config file option for selecting format states will be saved in. Mostly complete, needs a little more work before release
Michael Pavone <pavone@retrodev.com>
parents:
1423
diff
changeset
|
629 } |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
630 |
1955
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
631 if (loaded && !reader_addr) { |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
632 if (stype == SYSTEM_UNKNOWN) { |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
633 stype = detect_system_type(&cart); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
634 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
635 if (stype == SYSTEM_UNKNOWN) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
636 fatal_error("Failed to detect system type for %s\n", romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
637 } |
2053 | 638 |
1955
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
639 current_system = alloc_config_system(stype, &cart, menu ? 0 : opts, force_region); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
640 if (!current_system) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
641 fatal_error("Failed to configure emulated machine for %s\n", romfname); |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
642 } |
2053 | 643 |
1595
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
644 setup_saves(&cart, current_system); |
360d5bab199f
Update controller config when changed in UI without restart
Michael Pavone <pavone@retrodev.com>
parents:
1593
diff
changeset
|
645 update_title(current_system->info.name); |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
646 if (menu) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
647 menu_system = current_system; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
648 } else { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
649 game_system = current_system; |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
650 } |
874
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
651 } |
2053 | 652 |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
653 #ifndef DISABLE_NUKLEAR |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
654 if (use_nuklear) { |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
655 blastem_nuklear_init(!menu); |
2600
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
656 #ifndef __EMSCRIPTEN__ |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
657 current_system = game_system; |
1486
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
658 menu = 0; |
2600
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
659 #endif |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
660 } |
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
661 #endif |
1955
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
662 |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
663 if (reader_addr) { |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
664 init_event_reader_tcp(&reader, reader_addr, reader_port); |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
665 stype = reader_system_type(&reader); |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
666 if (stype == SYSTEM_UNKNOWN) { |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
667 fatal_error("Failed to detect system type for %s\n", romfname); |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
668 } |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
669 game_system = current_system = alloc_config_player(stype, &reader); |
1958
9c01945b5d20
Use zlib to compress event log streams
Mike Pavone <pavone@retrodev.com>
parents:
1955
diff
changeset
|
670 //free inflate stream as it was inflateCopied to an internal event reader in the player |
9c01945b5d20
Use zlib to compress event log streams
Mike Pavone <pavone@retrodev.com>
parents:
1955
diff
changeset
|
671 inflateEnd(&reader.input_stream); |
1955
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
672 setup_saves(&cart, current_system); |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
673 update_title(current_system->info.name); |
1c7af12efe8b
Fix awful playback latencin in new netplay implementation
Michael Pavone <pavone@retrodev.com>
parents:
1952
diff
changeset
|
674 } |
2053 | 675 |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
676 current_system->debugger_type = dtype; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
677 current_system->enter_debugger = start_in_debugger && menu == debug_target; |
2600
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
678 #ifndef __EMSCRIPTEN__ |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
679 current_system->start_context(current_system, menu ? NULL : statefile); |
1932
b387f1c5a1d0
WIP new sync mode that runs emulation on audio thread
Michael Pavone <pavone@retrodev.com>
parents:
1850
diff
changeset
|
680 render_video_loop(); |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
681 for(;;) |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
682 { |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
683 if (current_system->should_exit) { |
949
5e4fb650de58
Make Exit option in menu work
Michael Pavone <pavone@retrodev.com>
parents:
940
diff
changeset
|
684 break; |
5e4fb650de58
Make Exit option in menu work
Michael Pavone <pavone@retrodev.com>
parents:
940
diff
changeset
|
685 } |
1397
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
686 if (current_system->next_rom) { |
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
687 char *next_rom = current_system->next_rom; |
89eb967fed72
Initial support for drag and drop. Some work needed for proper menu integration.
Michael Pavone <pavone@retrodev.com>
parents:
1395
diff
changeset
|
688 current_system->next_rom = NULL; |
1483
001120e91fed
Skip loading menu ROM if Nuklear UI is enabled. Allow disabling Nuklear UI in favor of old menu ROM both at compile time and in config. Fall back to ROM UI if GL is unavailable
Michael Pavone <pavone@retrodev.com>
parents:
1474
diff
changeset
|
689 init_system_with_media(next_rom, force_stype); |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
690 menu = 0; |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
691 current_system = game_system; |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
692 current_system->debugger_type = dtype; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
693 current_system->enter_debugger = start_in_debugger && menu == debug_target; |
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
694 current_system->start_context(current_system, statefile); |
1980
81df9aa2de9b
Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents:
1975
diff
changeset
|
695 render_video_loop(); |
1423
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
696 } else if (menu && game_system) { |
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
697 current_system->arena = set_current_arena(game_system->arena); |
9a3e003bdcb3
Make drag and drop play nice with the menu
Michael Pavone <pavone@retrodev.com>
parents:
1412
diff
changeset
|
698 current_system = game_system; |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
699 menu = 0; |
1111
2eb54e24914e
Mostly working changes to allow support for multiple emulated system types in main blastem program
Michael Pavone <pavone@retrodev.com>
parents:
1103
diff
changeset
|
700 current_system->resume_context(current_system); |
1486
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
701 } else if (!menu && (menu_system || use_nuklear)) { |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
702 if (use_nuklear) { |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
703 #ifndef DISABLE_NUKLEAR |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
704 ui_idle_loop(); |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
705 #endif |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
706 } else { |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
707 current_system->arena = set_current_arena(menu_system->arena); |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
708 current_system = menu_system; |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
709 menu = 1; |
a6881d0d76d0
Pause game execution when in the new UI pause menu
Michael Pavone <pavone@retrodev.com>
parents:
1483
diff
changeset
|
710 } |
1487
6a35815cc409
Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1486
diff
changeset
|
711 if (!current_system->next_rom) { |
6a35815cc409
Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1486
diff
changeset
|
712 current_system->resume_context(current_system); |
1980
81df9aa2de9b
Less hacky run on audio thread mode
Michael Pavone <pavone@retrodev.com>
parents:
1975
diff
changeset
|
713 render_video_loop(); |
1487
6a35815cc409
Enable lock-on in Nuklear UI
Michael Pavone <pavone@retrodev.com>
parents:
1486
diff
changeset
|
714 } |
883
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
715 } else { |
9f149f0e98b7
It is now possible to switch back and forth between the menu ROM and the game
Michael Pavone <pavone@retrodev.com>
parents:
875
diff
changeset
|
716 break; |
874
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
717 } |
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
718 } |
2600
251cc75574af
Basic emscripten support
Michael Pavone <pavone@retrodev.com>
parents:
2546
diff
changeset
|
719 #endif //__EMSCRIPTEN__ |
874
b6842dfb8edf
ROM is now run after being selected in menu. Initial path for menu is read from config file.
Michael Pavone <pavone@retrodev.com>
parents:
872
diff
changeset
|
720 |
88
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
721 return 0; |
c339559f1d4f
Forgot to add blastem main file earlier
Mike Pavone <pavone@retrodev.com>
parents:
diff
changeset
|
722 } |