empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some change to better structure the code.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2020-12-11 19:38:47 +00:00
parent 40b838aeb9
commit 7f441060f2
1 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
source/frontends/retro/libretro.cpp
View file

@ -35,9 +35,6 @@
namespace namespace
{ {
bool use_audio_cb;
float last_aspect;
float last_sample_rate;
std::string retro_base_directory; std::string retro_base_directory;
retro_video_refresh_t video_cb; retro_video_refresh_t video_cb;
@ -45,11 +42,10 @@ namespace
retro_audio_sample_batch_t audio_batch_cb; retro_audio_sample_batch_t audio_batch_cb;
retro_input_poll_t input_poll_cb; retro_input_poll_t input_poll_cb;
retro_input_state_t input_state_cb; retro_input_state_t input_state_cb;
retro_rumble_interface rumble;
retro_environment_t environ_cb; retro_environment_t environ_cb;
Speed speed(true); Speed speed(true); // fixed speed
void initialiseEmulator() void initialiseEmulator()
{ {
@ -63,7 +59,6 @@ namespace
g_nAppMode = MODE_RUNNING; g_nAppMode = MODE_RUNNING;
LogFileOutput("Initialisation\n"); LogFileOutput("Initialisation\n");
ImageInitialize();
g_bFullSpeed = false; g_bFullSpeed = false;
LoadConfiguration(); LoadConfiguration();
@ -103,11 +98,39 @@ namespace
CpuDestroy(); CpuDestroy();
GetCardMgr().GetDisk2CardMgr().Destroy(); GetCardMgr().GetDisk2CardMgr().Destroy();
ImageDestroy();
LogDone(); LogDone();
RiffFinishWriteFile(); RiffFinishWriteFile();
} }
void runOneFrame()
{
if (g_nAppMode == MODE_RUNNING)
{
const size_t cyclesToExecute = speed.getCyclesTillNext(16);
const bool bVideoUpdate = true;
const UINT dwClksPerFrame = NTSC_GetCyclesPerFrame();
const DWORD executedCycles = CpuExecute(cyclesToExecute, bVideoUpdate);
g_dwCyclesThisFrame = (g_dwCyclesThisFrame + executedCycles) % dwClksPerFrame;
GetCardMgr().GetDisk2CardMgr().UpdateDriveState(executedCycles);
MB_PeriodicUpdate(executedCycles);
SpkrUpdate(executedCycles);
}
}
void processInputEvents()
{
input_poll_cb();
const int16_t is_down = input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_a);
if (is_down)
{
log_cb(RETRO_LOG_INFO, "RA2: %s. A is down\n", __FUNCTION__);
}
}
} }
int MessageBox(HWND, const char * text, const char * caption, UINT type) int MessageBox(HWND, const char * text, const char * caption, UINT type)
@ -185,17 +208,15 @@ void retro_get_system_info(retro_system_info *info)
void retro_get_system_av_info(retro_system_av_info *info) void retro_get_system_av_info(retro_system_av_info *info)
{ {
log_cb(RETRO_LOG_INFO, "RA2: %s\n", __FUNCTION__); log_cb(RETRO_LOG_INFO, "RA2: %s\n", __FUNCTION__);
float aspect = 0.0f;
float sampling_rate = 30000.0f;
info->geometry.base_width = GetFrameBufferWidth(); info->geometry.base_width = GetFrameBufferWidth();
info->geometry.base_height = GetFrameBufferHeight(); info->geometry.base_height = GetFrameBufferHeight();
info->geometry.max_width = GetFrameBufferWidth(); info->geometry.max_width = GetFrameBufferWidth();
info->geometry.max_height = GetFrameBufferHeight(); info->geometry.max_height = GetFrameBufferHeight();
info->geometry.aspect_ratio = aspect; info->geometry.aspect_ratio = 0;
last_aspect = aspect; info->timing.fps = 60;
last_sample_rate = sampling_rate; info->timing.sample_rate = 0;
} }
void retro_set_environment(retro_environment_t cb) void retro_set_environment(retro_environment_t cb)
@ -210,7 +231,7 @@ void retro_set_environment(retro_environment_t cb)
static const retro_controller_description controllers[] = static const retro_controller_description controllers[] =
{ {
{ "Nintendo DS", RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 0) }, { "Apple Keyboard", RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_KEYBOARD, 0) },
}; };
static const retro_controller_info ports[] = static const retro_controller_info ports[] =
@ -254,24 +275,10 @@ void retro_set_video_refresh(retro_video_refresh_t cb)
void retro_run(void) void retro_run(void)
{ {
if (g_nAppMode == MODE_RUNNING)
{
const size_t cyclesToExecute = speed.getCyclesTillNext(16);
const bool bVideoUpdate = true;
const UINT dwClksPerFrame = NTSC_GetCyclesPerFrame();
const DWORD executedCycles = CpuExecute(cyclesToExecute, bVideoUpdate);
g_dwCyclesThisFrame = (g_dwCyclesThisFrame + executedCycles) % dwClksPerFrame;
GetCardMgr().GetDisk2CardMgr().UpdateDriveState(executedCycles);
MB_PeriodicUpdate(executedCycles);
SpkrUpdate(executedCycles);
}
// log_cb(RETRO_LOG_INFO, "RA2: %s\n", __FUNCTION__);
const size_t pitch = GetFrameBufferWidth() * 4;
input_poll_cb(); input_poll_cb();
processInputEvents();
runOneFrame();
const size_t pitch = GetFrameBufferWidth() * 4;
video_cb(g_pFramebufferbits, GetFrameBufferWidth(), GetFrameBufferHeight(), pitch); video_cb(g_pFramebufferbits, GetFrameBufferWidth(), GetFrameBufferHeight(), pitch);
} }