diff options
| author | Jesse Talavera-Greenberg <jesse@jesse.tg> | 2023-11-25 12:32:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-25 18:32:09 +0100 |
| commit | 346dd4006ea1283136095d5c43f602324a095092 (patch) | |
| tree | edf04631782bbfcdb48eac79b79aebb11b40f479 /src/frontend/qt_sdl/CameraManager.h | |
| parent | 651b0f680c4531558990a5beb0e638968009dc51 (diff) | |
Move all core types into namespaces (#1886)
* Reorganize namespaces
- Most types are now moved into the `melonDS` namespace
- Only good chance to do this for a while, since a big refactor is next
* Fix the build
Diffstat (limited to 'src/frontend/qt_sdl/CameraManager.h')
| -rw-r--r-- | src/frontend/qt_sdl/CameraManager.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/frontend/qt_sdl/CameraManager.h b/src/frontend/qt_sdl/CameraManager.h index 91e73fb..882b051 100644 --- a/src/frontend/qt_sdl/CameraManager.h +++ b/src/frontend/qt_sdl/CameraManager.h @@ -89,11 +89,11 @@ public: void setXFlip(bool flip); - void captureFrame(u32* frame, int width, int height, bool yuv); + void captureFrame(melonDS::u32* frame, int width, int height, bool yuv); - void feedFrame(u32* frame, int width, int height, bool yuv); - void feedFrame_UYVY(u32* frame, int width, int height); - void feedFrame_NV12(u8* planeY, u8* planeUV, int width, int height); + void feedFrame(melonDS::u32* frame, int width, int height, bool yuv); + void feedFrame_UYVY(melonDS::u32* frame, int width, int height); + void feedFrame_NV12(melonDS::u8* planeY, melonDS::u8* planeUV, int width, int height); signals: void camStartSignal(); @@ -120,15 +120,15 @@ private: int frameWidth, frameHeight; bool frameFormatYUV; - u32* frameBuffer; - u32* tempFrameBuffer; + melonDS::u32* frameBuffer; + melonDS::u32* tempFrameBuffer; QMutex frameMutex; bool xFlip; - void copyFrame_Straight(u32* src, int swidth, int sheight, u32* dst, int dwidth, int dheight, bool xflip, bool yuv); - void copyFrame_RGBtoYUV(u32* src, int swidth, int sheight, u32* dst, int dwidth, int dheight, bool xflip); - void copyFrame_YUVtoRGB(u32* src, int swidth, int sheight, u32* dst, int dwidth, int dheight, bool xflip); + void copyFrame_Straight(melonDS::u32* src, int swidth, int sheight, melonDS::u32* dst, int dwidth, int dheight, bool xflip, bool yuv); + void copyFrame_RGBtoYUV(melonDS::u32* src, int swidth, int sheight, melonDS::u32* dst, int dwidth, int dheight, bool xflip); + void copyFrame_YUVtoRGB(melonDS::u32* src, int swidth, int sheight, melonDS::u32* dst, int dwidth, int dheight, bool xflip); }; #endif // CAMERAMANAGER_H |