Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 05:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] linux: update to build again

Browse Source
This commit is contained in:
Geoffrey McRae 2024-02-27 18:55:48 +11:00
parent 71b826458d
commit 57ac020c8c
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
host/platform/Linux/capture/XCB/src/xcb.c
View File

@ -85,7 +85,11 @@ static void xcb_initOptions(void)
option_register(options); option_register(options);
} }
static bool xcb_create(CaptureGetPointerBuffer getPointerBufferFn, CapturePostPointerBuffer postPointerBufferFn) static bool xcb_create(
CaptureGetPointerBuffer getPointerBufferFn,
CapturePostPointerBuffer postPointerBufferFn,
unsigned frameBuffers
)
{ {
DEBUG_ASSERT(!this); DEBUG_ASSERT(!this);
this = calloc(1, sizeof(*this)); this = calloc(1, sizeof(*this));
@ -106,7 +110,7 @@ static bool xcb_create(CaptureGetPointerBuffer getPointerBufferFn, CapturePostPo
return true; return true;
} }
static bool xcb_init(void) static bool xcb_init(void * ivshmemBase, unsigned * alignSize)
{ {
DEBUG_ASSERT(this); DEBUG_ASSERT(this);
DEBUG_ASSERT(!this->initialized); DEBUG_ASSERT(!this->initialized);
@ -241,7 +245,9 @@ static void xcb_free(void)
this = NULL; this = NULL;
} }
static CaptureResult xcb_capture(void) static CaptureResult xcb_capture(
unsigned frameBufferIndex,
FrameBuffer * frame)
{ {
DEBUG_ASSERT(this); DEBUG_ASSERT(this);
DEBUG_ASSERT(this->initialized); DEBUG_ASSERT(this->initialized);
@ -266,8 +272,10 @@ static CaptureResult xcb_capture(void)
return CAPTURE_RESULT_OK; return CAPTURE_RESULT_OK;
} }
static CaptureResult xcb_waitFrame(CaptureFrame * frame, static CaptureResult xcb_waitFrame(
const size_t maxFrameSize) unsigned frameBufferIndex,
CaptureFrame * frame,
const size_t maxFrameSize)
{ {
lgWaitEvent(this->frameEvent, TIMEOUT_INFINITE); lgWaitEvent(this->frameEvent, TIMEOUT_INFINITE);
@ -290,7 +298,10 @@ static CaptureResult xcb_waitFrame(CaptureFrame * frame,
return CAPTURE_RESULT_OK; return CAPTURE_RESULT_OK;
} }
static CaptureResult xcb_getFrame(FrameBuffer * frame, int frameIndex) static CaptureResult xcb_getFrame(
unsigned frameBufferIndex,
FrameBuffer * frame,
const size_t maxFrameSize)
{ {
DEBUG_ASSERT(this); DEBUG_ASSERT(this);
DEBUG_ASSERT(this->initialized); DEBUG_ASSERT(this->initialized);
@ -371,7 +382,7 @@ static int pointerThread(void * unused)
pointer.height = curReply->height; pointer.height = curReply->height;
pointer.pitch = curReply->width * 4; pointer.pitch = curReply->width * 4;
this->postPointerBufferFn(pointer); this->postPointerBufferFn(&pointer);
} }
free(curReply); free(curReply);

23
host/platform/Linux/capture/pipewire/src/pipewire.c
View File

@ -68,7 +68,11 @@ static const char * pipewire_getName(void)
return "PipeWire"; return "PipeWire";
} }
static bool pipewire_create(CaptureGetPointerBuffer getPointerBufferFn, CapturePostPointerBuffer postPointerBufferFn) static bool pipewire_create(
CaptureGetPointerBuffer getPointerBufferFn,
CapturePostPointerBuffer postPointerBufferFn,
unsigned frameBuffers
)
{ {
DEBUG_ASSERT(!this); DEBUG_ASSERT(!this);
pw_init(NULL, NULL); pw_init(NULL, NULL);
@ -231,7 +235,7 @@ static const struct pw_stream_events streamEvents = {
.param_changed = streamParamChangedCallback, .param_changed = streamParamChangedCallback,
}; };
static bool pipewire_init(void) static bool pipewire_init(void * ivshmemBase, unsigned * alignSize)
{ {
DEBUG_ASSERT(this); DEBUG_ASSERT(this);
this->stop = false; this->stop = false;
@ -400,7 +404,9 @@ static void pipewire_free(void)
this = NULL; this = NULL;
} }
static CaptureResult pipewire_capture(void) static CaptureResult pipewire_capture(
unsigned frameBufferIndex,
FrameBuffer * frame)
{ {
int result; int result;
@ -424,8 +430,10 @@ restart:
return CAPTURE_RESULT_OK; return CAPTURE_RESULT_OK;
} }
static CaptureResult pipewire_waitFrame(CaptureFrame * frame, static CaptureResult pipewire_waitFrame(
const size_t maxFrameSize) unsigned frameBufferIndex,
CaptureFrame * frame,
const size_t maxFrameSize)
{ {
if (this->stop) if (this->stop)
return CAPTURE_RESULT_REINIT; return CAPTURE_RESULT_REINIT;
@ -454,7 +462,10 @@ static CaptureResult pipewire_waitFrame(CaptureFrame * frame,
return CAPTURE_RESULT_OK; return CAPTURE_RESULT_OK;
} }
static CaptureResult pipewire_getFrame(FrameBuffer * frame, int frameIndex) static CaptureResult pipewire_getFrame(
unsigned frameBufferIndex,
FrameBuffer * frame,
const size_t maxFrameSize)
{ {
if (this->stop || !this->frameData) if (this->stop || !this->frameData)
return CAPTURE_RESULT_REINIT; return CAPTURE_RESULT_REINIT;