Skip to content

Commit 683e087

Browse files
authored
Fixes
1 parent 4beec01 commit 683e087

37 files changed

+193
-109
lines changed

BeetleNGPRT/BeetleNGPCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ BeetleNGPCoreInternal^ BeetleNGPCoreInternal::Instance::get()
2424
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
2525
retro_extra_set_open_file([](String^ filePath, FileAccessMode accessMode) { return coreInstance->OpenFileStream(filePath, accessMode); });
2626
retro_extra_set_close_file([](IRandomAccessStream^ stream) { coreInstance->CloseFileStream(stream); });
27-
retro_init();
2827
}
2928

3029
return coreInstance;
3130
}
3231

33-
BeetleNGPCoreInternal::BeetleNGPCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
34-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
32+
BeetleNGPCoreInternal::BeetleNGPCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
33+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
34+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3535
true, true, false)
3636
{
3737
}

BeetlePCEFastRT/BeetlePCEFastCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ BeetlePCEFastCoreInternal^ BeetlePCEFastCoreInternal::Instance::get()
2424
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
2525
retro_extra_set_open_file([](String^ filePath, FileAccessMode accessMode) { return coreInstance->OpenFileStream(filePath, accessMode); });
2626
retro_extra_set_close_file([](IRandomAccessStream^ stream) { coreInstance->CloseFileStream(stream); });
27-
retro_init();
2827
}
2928

3029
return coreInstance;
3130
}
3231

33-
BeetlePCEFastCoreInternal::BeetlePCEFastCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
34-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
32+
BeetlePCEFastCoreInternal::BeetlePCEFastCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
33+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
34+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3535
true, true, false)
3636
{
3737
fileDependencies->Append(ref new FileDependency(L"syscard3.pce", L"PC Engine CD BIOS", L"ff1a674273fe3540ccef576376407d1d"));

BeetlePCFXRT/BeetlePCFXCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ BeetlePCFXCoreInternal^ BeetlePCFXCoreInternal::Instance::get()
2424
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
2525
retro_extra_set_open_file([](String^ filePath, FileAccessMode accessMode) { return coreInstance->OpenFileStream(filePath, accessMode); });
2626
retro_extra_set_close_file([](IRandomAccessStream^ stream) { coreInstance->CloseFileStream(stream); });
27-
retro_init();
2827
}
2928

3029
return coreInstance;
3130
}
3231

33-
BeetlePCFXCoreInternal::BeetlePCFXCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
34-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
32+
BeetlePCFXCoreInternal::BeetlePCFXCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
33+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
34+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3535
true, true, false)
3636
{
3737
fileDependencies->Append(ref new FileDependency(L"pcfx.rom", L"PC-FX BIOS", L"08e36edbea28a017f79f8d4f7ff9b6d7"));

BeetlePSXRT/BeetlePSXCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ BeetlePSXCoreInternal^ BeetlePSXCoreInternal::Instance::get()
2424
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
2525
retro_extra_set_open_file([](String^ filePath, FileAccessMode accessMode) { return coreInstance->OpenFileStream(filePath, accessMode); });
2626
retro_extra_set_close_file([](IRandomAccessStream^ stream) { coreInstance->CloseFileStream(stream); });
27-
retro_init();
2827
}
2928

3029
return coreInstance;
3130
}
3231

33-
BeetlePSXCoreInternal::BeetlePSXCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
34-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
32+
BeetlePSXCoreInternal::BeetlePSXCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
33+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
34+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3535
true, true, false)
3636
{
3737
fileDependencies->Append(ref new FileDependency(L"scph5500.bin", L"PlayStation (v3.0 09/09/96 J) BIOS", L"8dd7d5296a650fac7319bce665a6a53c"));

BeetleSaturnRT/BeetleSaturnCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ BeetleSaturnCoreInternal^ BeetleSaturnCoreInternal::Instance::get()
2424
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
2525
retro_extra_set_open_file([](String^ filePath, FileAccessMode accessMode) { return coreInstance->OpenFileStream(filePath, accessMode); });
2626
retro_extra_set_close_file([](IRandomAccessStream^ stream) { coreInstance->CloseFileStream(stream); });
27-
retro_init();
2827
}
2928

3029
return coreInstance;
3130
}
3231

33-
BeetleSaturnCoreInternal::BeetleSaturnCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
34-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
32+
BeetleSaturnCoreInternal::BeetleSaturnCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
33+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
34+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3535
true, true, false)
3636
{
3737
fileDependencies->Append(ref new FileDependency(L"sega_101.bin", L"Saturn BIOS", L"85ec9ca47d8f6807718151cbcca8b964"));

BeetleWswanRT/BeetleWswanCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ BeetleWswanCoreInternal^ BeetleWswanCoreInternal::Instance::get()
2424
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
2525
retro_extra_set_open_file([](String^ filePath, FileAccessMode accessMode) { return coreInstance->OpenFileStream(filePath, accessMode); });
2626
retro_extra_set_close_file([](IRandomAccessStream^ stream) { coreInstance->CloseFileStream(stream); });
27-
retro_init();
2827
}
2928

3029
return coreInstance;
3130
}
3231

33-
BeetleWswanCoreInternal::BeetleWswanCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
34-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
32+
BeetleWswanCoreInternal::BeetleWswanCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
33+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
34+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3535
true, true, false)
3636
{
3737
}

FBAlphaRT/FBAlphaCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ FBAlphaCoreInternal^ FBAlphaCoreInternal::Instance::get()
2424
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
2525
retro_extra_set_open_file([](String^ filePath, FileAccessMode accessMode) { return coreInstance->OpenFileStream(filePath, accessMode); });
2626
retro_extra_set_close_file([](IRandomAccessStream^ stream) { coreInstance->CloseFileStream(stream); });
27-
retro_init();
2827
}
2928

3029
return coreInstance;
3130
}
3231

33-
FBAlphaCoreInternal::FBAlphaCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
34-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
32+
FBAlphaCoreInternal::FBAlphaCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
33+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
34+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3535
true, true, true)
3636
{
3737
fileDependencies->Append(ref new FileDependency(L"neogeo.zip", L"NeoGeo BIOS collection", L"93adcaa22d652417cbc3927d46b11806"));

FCEUMMRT/FCEUMMCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ FCEUMMCoreInternal^ FCEUMMCoreInternal::Instance::get()
2121
retro_set_audio_sample([](int16_t left, int16_t right) { coreInstance->SingleAudioFrameHandler(left, right); });
2222
retro_set_audio_sample_batch([](const int16_t* data, size_t numFrames) { return coreInstance->RaiseRenderAudioFrames(data, numFrames); });
2323
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
24-
retro_init();
2524
}
2625

2726
return coreInstance;
2827
}
2928

30-
FCEUMMCoreInternal::FCEUMMCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
31-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
29+
FCEUMMCoreInternal::FCEUMMCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
30+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
31+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3232
false, false, false)
3333
{
3434
}

GPGXRT/GPGXCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ GPGXCoreInternal^ GPGXCoreInternal::Instance::get()
2424
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
2525
retro_extra_set_open_file([](String^ filePath, FileAccessMode accessMode) { return coreInstance->OpenFileStream(filePath, accessMode); });
2626
retro_extra_set_close_file([](IRandomAccessStream^ stream) { coreInstance->CloseFileStream(stream); });
27-
retro_init();
2827
}
2928

3029
return coreInstance;
3130
}
3231

33-
GPGXCoreInternal::GPGXCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
34-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
32+
GPGXCoreInternal::GPGXCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
33+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
34+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3535
true, true, false)
3636
{
3737
fileDependencies->Append(ref new FileDependency(L"BIOS_CD_E.bin", L"Mega-CD (Model 1 1.00 Europe) BIOS", L"e66fa1dc5820d254611fdcdba0662372"));

GambatteRT/GambatteCoreInternal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ GambatteCoreInternal^ GambatteCoreInternal::Instance::get()
2121
retro_set_audio_sample([](int16_t left, int16_t right) { coreInstance->SingleAudioFrameHandler(left, right); });
2222
retro_set_audio_sample_batch([](const int16_t* data, size_t numFrames) { return coreInstance->RaiseRenderAudioFrames(data, numFrames); });
2323
retro_set_video_refresh([](const void *data, unsigned width, unsigned height, size_t pitch) { coreInstance->RaiseRenderVideoFrame(data, width, height, pitch); });
24-
retro_init();
2524
}
2625

2726
return coreInstance;
2827
}
2928

30-
GambatteCoreInternal::GambatteCoreInternal() : LibretroRT_Tools::CoreBase(retro_get_system_info, retro_get_system_av_info,
31-
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize, retro_deinit,
29+
GambatteCoreInternal::GambatteCoreInternal() : LibretroRT_Tools::CoreBase(retro_init, retro_deinit,
30+
retro_get_system_info, retro_get_system_av_info, retro_set_controller_port_device,
31+
retro_load_game, retro_unload_game, retro_run, retro_reset, retro_serialize_size, retro_serialize, retro_unserialize,
3232
false, false, false)
3333
{
3434
}

0 commit comments

Comments
 (0)