Skip to content

Commit e805b17

Browse files
authored
Merge pull request hrydgard#21660 from hrydgard/mfplat-dynamic
Remove the mfplat.dll hard dependency (now fully dynamic).
2 parents 05e60d5 + d2c2ee3 commit e805b17

10 files changed

Lines changed: 190 additions & 166 deletions

File tree

Common/CommonTypes.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ typedef signed __int64 s64;
4848
#define ThreadContext _ThreadContext
4949
#include <switch.h>
5050
// Cleanup
51-
#undef KeyInputFlags::UP
52-
#undef KeyInputFlags::DOWN
5351
#undef Event
5452
#undef Framebuffer
5553
#undef Waitable

Core/HLE/sceUsbCam.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,10 @@ int Camera::startCapture() {
354354
if (winCamera) {
355355
if (winCamera->isShutDown()) {
356356
delete winCamera;
357-
winCamera = new WindowsCaptureDevice(CAPTUREDEVIDE_TYPE::VIDEO);
358-
winCamera->sendMessage({ CAPTUREDEVIDE_COMMAND::INITIALIZE, nullptr });
357+
winCamera = new WindowsCaptureDevice(CAPTUREDEVICE_TYPE::VIDEO);
359358
}
360359
void* resolution = static_cast<void*>(new std::vector<int>({ width, height }));
361-
winCamera->sendMessage({ CAPTUREDEVIDE_COMMAND::START, resolution });
360+
winCamera->sendMessage({ CAPTUREDEVICE_COMMAND::START, resolution });
362361
}
363362
#elif PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) || defined(USING_QT_UI)
364363
char command[40] = {0};
@@ -378,7 +377,7 @@ int Camera::stopCapture() {
378377
INFO_LOG(Log::HLE, "%s", __FUNCTION__);
379378
#ifdef HAVE_WIN32_CAMERA
380379
if (winCamera) {
381-
winCamera->sendMessage({ CAPTUREDEVIDE_COMMAND::STOP, nullptr });
380+
winCamera->sendMessage({ CAPTUREDEVICE_COMMAND::STOP, nullptr });
382381
}
383382
#elif PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) || defined(USING_QT_UI)
384383
System_CameraCommand("stopVideo");

Core/HLE/sceUsbMic.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ static int sceUsbMicWaitInputEnd() {
307307
int Microphone::startMic(void *param) {
308308
#ifdef HAVE_WIN32_MICROPHONE
309309
if (winMic)
310-
winMic->sendMessage({ CAPTUREDEVIDE_COMMAND::START, param });
310+
winMic->sendMessage({ CAPTUREDEVICE_COMMAND::START, param });
311311
#elif PPSSPP_PLATFORM(ANDROID)
312312
std::vector<u32> *micParam = static_cast<std::vector<u32>*>(param);
313313
int sampleRate = micParam->at(0);
@@ -322,7 +322,7 @@ int Microphone::startMic(void *param) {
322322
int Microphone::stopMic() {
323323
#ifdef HAVE_WIN32_MICROPHONE
324324
if (winMic)
325-
winMic->sendMessage({ CAPTUREDEVIDE_COMMAND::STOP, nullptr });
325+
winMic->sendMessage({ CAPTUREDEVICE_COMMAND::STOP, nullptr });
326326
#elif PPSSPP_PLATFORM(ANDROID)
327327
System_MicrophoneCommand("stopRecording");
328328
#endif

UI/NativeApp.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -832,10 +832,8 @@ bool NativeInitGraphics(GraphicsContext *graphicsContext) {
832832

833833
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
834834
if (IsWin7OrHigher()) {
835-
winCamera = new WindowsCaptureDevice(CAPTUREDEVIDE_TYPE::VIDEO);
836-
winCamera->sendMessage({ CAPTUREDEVIDE_COMMAND::INITIALIZE, nullptr });
837-
winMic = new WindowsCaptureDevice(CAPTUREDEVIDE_TYPE::Audio);
838-
winMic->sendMessage({ CAPTUREDEVIDE_COMMAND::INITIALIZE, nullptr });
835+
winCamera = new WindowsCaptureDevice(CAPTUREDEVICE_TYPE::VIDEO);
836+
winMic = new WindowsCaptureDevice(CAPTUREDEVICE_TYPE::AUDIO);
839837
}
840838
#endif
841839

0 commit comments

Comments
 (0)