From 73146d8957d6dc746d9c41cdd4f71c00d1b7000e Mon Sep 17 00:00:00 2001 From: dec05eba Date: Mon, 15 Jul 2024 23:17:00 +0200 Subject: Include virtual capture target in portal capture --- src/capture/portal.c | 2 +- src/main.cpp | 2 +- src/pipewire.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/capture/portal.c b/src/capture/portal.c index 77da206..a6066a9 100644 --- a/src/capture/portal.c +++ b/src/capture/portal.c @@ -179,7 +179,7 @@ static bool gsr_capture_portal_setup_dbus(gsr_capture_portal *self) { } fprintf(stderr, "gsr info: gsr_capture_portal_setup_dbus: SelectSources\n"); - if(!gsr_dbus_screencast_select_sources(&self->dbus, self->session_handle, GSR_PORTAL_CAPTURE_TYPE_MONITOR | GSR_PORTAL_CAPTURE_TYPE_WINDOW, self->params.record_cursor ? GSR_PORTAL_CURSOR_MODE_EMBEDDED : GSR_PORTAL_CURSOR_MODE_HIDDEN)) { + if(!gsr_dbus_screencast_select_sources(&self->dbus, self->session_handle, GSR_PORTAL_CAPTURE_TYPE_ALL, self->params.record_cursor ? GSR_PORTAL_CURSOR_MODE_EMBEDDED : GSR_PORTAL_CURSOR_MODE_HIDDEN)) { fprintf(stderr, "gsr error: gsr_capture_portal_setup_dbus: SelectSources failed\n"); return false; } diff --git a/src/main.cpp b/src/main.cpp index acb4c83..2fdfc36 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2201,7 +2201,7 @@ int main(int argc, char **argv) { const char *window_str = strdup(args["-w"].value()); if(!restore_portal_session && strcmp(window_str, "portal") == 0) { - fprintf(stderr, "gsr info: '-w portal' option used without '-restore-portal-session yes'. The previous screencast session will be ignored\n"); + fprintf(stderr, "gsr info: option '-w portal' was used without '-restore-portal-session yes'. The previous screencast session will be ignored\n"); } bool wayland = false; diff --git a/src/pipewire.c b/src/pipewire.c index 73051a4..41139f5 100644 --- a/src/pipewire.c +++ b/src/pipewire.c @@ -551,7 +551,7 @@ void gsr_pipewire_deinit(gsr_pipewire *self) { } } -/* TODO: Do this in the thread instead, otherwise this is not guaranteed to always work and may produce glitched output */ +/* TODO: Do this in the thread instead, otherwise this is not guaranteed to always work and may produce glitched output (happens now when resizing the captured window) */ bool gsr_pipewire_map_texture(gsr_pipewire *self, unsigned int texture_id, unsigned int cursor_texture_id, gsr_pipewire_region *region, gsr_pipewire_region *cursor_region) { pthread_mutex_lock(&self->mutex); -- cgit v1.2.3