public/gpu-screen-recorder
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder synced 2026-05-06 15:00:43 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add nicer error message when no screencast desktop portal is running

Browse Source
This commit is contained in:
dec05eba
2024-07-15 19:19:38 +02:00
parent 9dbd86dc54
commit 32b1cc2df9
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dbus.c
View File

@@ -192,12 +192,12 @@ static bool gsr_dbus_desktop_portal_get_property(gsr_dbus *self, const char *int
if(dbus_message_iter_get_arg_type(&variant_iter) == DBUS_TYPE_UINT32) { if(dbus_message_iter_get_arg_type(&variant_iter) == DBUS_TYPE_UINT32) {
dbus_message_iter_get_basic(&variant_iter, result); dbus_message_iter_get_basic(&variant_iter, result);
} else { } else {
fprintf(stderr, "gsr error: gsr_dbus_call_screencast_method: response message is not a variant with an uint32, %c\n", dbus_message_iter_get_arg_type(&variant_iter)); fprintf(stderr, "gsr error: gsr_dbus_desktop_portal_get_property: response message is not a variant with an uint32, %c\n", dbus_message_iter_get_arg_type(&variant_iter));
dbus_message_unref(msg); dbus_message_unref(msg);
return false; return false;
} }
} else { } else {
fprintf(stderr, "gsr error: gsr_dbus_call_screencast_method: response message is not an uint32, %c\n", dbus_message_iter_get_arg_type(&resp_args)); fprintf(stderr, "gsr error: gsr_dbus_desktop_portal_get_property: response message is not an uint32, %c\n", dbus_message_iter_get_arg_type(&resp_args));
dbus_message_unref(msg); dbus_message_unref(msg);
return false; return false;
// TODO: Check dbus_error_is_set? // TODO: Check dbus_error_is_set?
@@ -370,6 +370,14 @@ static bool gsr_dbus_call_screencast_method(gsr_dbus *self, const char *method_n
if(resp_fd) if(resp_fd)
*resp_fd = fd; *resp_fd = fd;
} else if(DBUS_TYPE_STRING == dbus_message_iter_get_arg_type(&resp_args)) {
char *err = NULL;
dbus_message_iter_get_basic(&resp_args, &err);
fprintf(stderr, "gsr error: gsr_dbus_call_screencast_method: failed with error: %s\n", err);
dbus_message_unref(msg);
return false;
// TODO: Check dbus_error_is_set?
} else { } else {
fprintf(stderr, "gsr error: gsr_dbus_call_screencast_method: response message is not an object path or unix fd\n"); fprintf(stderr, "gsr error: gsr_dbus_call_screencast_method: response message is not an object path or unix fd\n");
dbus_message_unref(msg); dbus_message_unref(msg);
@@ -556,8 +564,10 @@ bool gsr_dbus_screencast_create_session(gsr_dbus *self, char **session_handle) {
args[1].value_type = DICT_TYPE_STRING; args[1].value_type = DICT_TYPE_STRING;
args[1].str = session_handle_token; args[1].str = session_handle_token;
if(!gsr_dbus_call_screencast_method(self, "CreateSession", NULL, NULL, args, 2, NULL)) if(!gsr_dbus_call_screencast_method(self, "CreateSession", NULL, NULL, args, 2, NULL)) {
fprintf(stderr, "gsr error: gsr_dbus_screencast_create_session: failed to setup ScreenCast session. Make sure you have a desktop portal running with support for the ScreenCast interface (usually only available on Wayland).\n");
return false; return false;
}
DBusMessage *msg = NULL; DBusMessage *msg = NULL;

1
src/pipewire.c
View File

@@ -11,7 +11,6 @@
/* TODO: Make gsr_pipewire_init asynchronous */ /* TODO: Make gsr_pipewire_init asynchronous */
/* TODO: Support 10-bit capture (hdr) when pipewire supports it */ /* TODO: Support 10-bit capture (hdr) when pipewire supports it */
/* TODO: Support video crop and cursor data (that is not embedded) */
/* TODO: Test all of the image formats */ /* TODO: Test all of the image formats */
#ifndef SPA_POD_PROP_FLAG_DONT_FIXATE #ifndef SPA_POD_PROP_FLAG_DONT_FIXATE