From d84054ecbbd15e92736e5e5f55e36f72f410d3a5 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sun, 20 Oct 2024 22:44:15 +0200 Subject: gsr-overlay > gsr-ui --- src/Config.cpp | 4 ++-- src/Overlay.cpp | 14 +++++++------- src/Process.cpp | 2 +- src/Utils.cpp | 2 +- src/gui/FileChooser.cpp | 2 +- src/gui/SettingsPage.cpp | 5 +++-- src/main.cpp | 6 +++--- 7 files changed, 18 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/Config.cpp b/src/Config.cpp index 88eead9..b9319aa 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -111,7 +111,7 @@ namespace gsr { std::optional read_config() { std::optional config; - const std::string config_path = get_config_dir() + "/overlay_config"; + const std::string config_path = get_config_dir() + "/config_ui"; std::string file_content; if(!file_get_content(config_path.c_str(), file_content)) { fprintf(stderr, "Warning: Failed to read config file: %s\n", config_path.c_str()); @@ -173,7 +173,7 @@ namespace gsr { void save_config(Config &config) { config.main_config.config_file_version = CONFIG_FILE_VERSION; - const std::string config_path = get_config_dir() + "/overlay_config"; + const std::string config_path = get_config_dir() + "/config_ui"; char dir_tmp[PATH_MAX]; snprintf(dir_tmp, sizeof(dir_tmp), "%s", config_path.c_str()); diff --git a/src/Overlay.cpp b/src/Overlay.cpp index cee40b7..c8b2678 100644 --- a/src/Overlay.cpp +++ b/src/Overlay.cpp @@ -553,7 +553,7 @@ namespace gsr { std::optional status_filepath = get_gsr_runtime_dir(); if(!status_filepath) - throw std::runtime_error("Failed to find/create runtime directory /run/user/.../gsr-overlay or /tmp/gsr-overlay"); + throw std::runtime_error("Failed to find/create runtime directory /run/user/.../gsr-ui or /tmp/gsr-ui"); status_filepath.value() += "/status"; @@ -567,7 +567,7 @@ namespace gsr { void Overlay::save_program_status() { std::optional status_filepath = get_gsr_runtime_dir(); if(!status_filepath) - throw std::runtime_error("Failed to find/create runtime directory /run/user/.../gsr-overlay or /tmp/gsr-overlay"); + throw std::runtime_error("Failed to find/create runtime directory /run/user/.../gsr-ui or /tmp/gsr-ui"); status_filepath.value() += "/status"; if(!file_overwrite(status_filepath.value().c_str(), recording_status_to_string(recording_status))) @@ -579,7 +579,7 @@ namespace gsr { std::optional status_filepath = get_gsr_runtime_dir(); if(!status_filepath) - throw std::runtime_error("Failed to find/create runtime directory /run/user/.../gsr-overlay or /tmp/gsr-overlay"); + throw std::runtime_error("Failed to find/create runtime directory /run/user/.../gsr-ui or /tmp/gsr-ui"); status_filepath.value() += "/pid"; @@ -599,12 +599,12 @@ namespace gsr { char program_arg0[PATH_MAX]; program_arg0[0] = '\0'; if(!read_cmdline_arg0(cmdline_path, program_arg0)) { - fprintf(stderr, "Error: failed to parse arg0 from file %s. Was the gpu-screen-recorder process that was started by gsr-overlay closed by another program or the user?\n", cmdline_path); + fprintf(stderr, "Error: failed to parse arg0 from file %s. Was the gpu-screen-recorder process that was started by gsr-ui closed by another program or the user?\n", cmdline_path); return; } if(strcmp(program_arg0, "gpu-screen-recorder") != 0) { - fprintf(stderr, "Warning: process %d exists but doesn't belong to gpu-screen-recorder (is instead %s). Was the gpu-screen-recorder process that was started by gsr-overlay closed by another program or the user?\n", pid, program_arg0); + fprintf(stderr, "Warning: process %d exists but doesn't belong to gpu-screen-recorder (is instead %s). Was the gpu-screen-recorder process that was started by gsr-ui closed by another program or the user?\n", pid, program_arg0); return; } @@ -614,7 +614,7 @@ namespace gsr { void Overlay::save_program_pid() { std::optional status_filepath = get_gsr_runtime_dir(); if(!status_filepath) - throw std::runtime_error("Failed to find/create runtime directory /run/user/.../gsr-overlay or /tmp/gsr-overlay"); + throw std::runtime_error("Failed to find/create runtime directory /run/user/.../gsr-ui or /tmp/gsr-ui"); status_filepath.value() += "/pid"; @@ -627,7 +627,7 @@ namespace gsr { void Overlay::recording_stopped_remove_runtime_files() { std::optional status_filepath = get_gsr_runtime_dir(); if(!status_filepath) { - fprintf(stderr, "Error: Failed to find/create runtime directory /run/user/.../gsr-overlay or /tmp/gsr-overlay"); + fprintf(stderr, "Error: Failed to find/create runtime directory /run/user/.../gsr-ui or /tmp/gsr-ui"); return; } diff --git a/src/Process.cpp b/src/Process.cpp index f9c896c..07d9dc6 100644 --- a/src/Process.cpp +++ b/src/Process.cpp @@ -11,7 +11,7 @@ namespace gsr { static void debug_print_args(const char **args) { - fprintf(stderr, "gsr-overlay info: running command:"); + fprintf(stderr, "gsr-ui info: running command:"); while(*args) { fprintf(stderr, " %s", *args); ++args; diff --git a/src/Utils.cpp b/src/Utils.cpp index c3da908..0f86ecc 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -208,7 +208,7 @@ namespace gsr { if(stat(runtime_dir_path, &st) == -1 || !S_ISDIR(st.st_mode)) snprintf(runtime_dir_path, sizeof(runtime_dir_path), "/tmp"); - strcat(runtime_dir_path, "/gsr-overlay"); + strcat(runtime_dir_path, "/gsr-ui"); if(create_directory_recursive(runtime_dir_path) != 0) return result; diff --git a/src/gui/FileChooser.cpp b/src/gui/FileChooser.cpp index a48a3b0..8ec498f 100644 --- a/src/gui/FileChooser.cpp +++ b/src/gui/FileChooser.cpp @@ -138,7 +138,7 @@ namespace gsr { DIR *d = opendir(directory); if(!d) { - fprintf(stderr, "gsr-overlay error: failed to open directory: %s, error: %s\n", directory, strerror(errno)); + fprintf(stderr, "gsr-ui error: failed to open directory: %s, error: %s\n", directory, strerror(errno)); return; } diff --git a/src/gui/SettingsPage.cpp b/src/gui/SettingsPage.cpp index 8b06499..fb2cc68 100644 --- a/src/gui/SettingsPage.cpp +++ b/src/gui/SettingsPage.cpp @@ -48,8 +48,9 @@ namespace gsr { std::unique_ptr SettingsPage::create_record_area_box(const GsrInfo &gsr_info) { auto record_area_box = std::make_unique(&get_theme().body_font); // TODO: Show options not supported but disable them - if(gsr_info.supported_capture_options.window) - record_area_box->add_item("Window", "window"); + // TODO: Enable this + //if(gsr_info.supported_capture_options.window) + // record_area_box->add_item("Window", "window"); if(gsr_info.supported_capture_options.focused) record_area_box->add_item("Follow focused window", "focused"); if(gsr_info.supported_capture_options.screen) diff --git a/src/main.cpp b/src/main.cpp index 120280d..3760368 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -72,10 +72,10 @@ int main(int argc, char **argv) { if(access("images/gpu_screen_recorder_logo.png", F_OK) == 0) { resources_path = "./"; } else { -#ifdef GSR_OVERLAY_RESOURCES_PATH - resources_path = GSR_OVERLAY_RESOURCES_PATH "/"; +#ifdef GSR_UI_RESOURCES_PATH + resources_path = GSR_UI_RESOURCES_PATH "/"; #else - resources_path = "/usr/share/gsr-overlay/"; + resources_path = "/usr/share/gsr-ui/"; #endif } -- cgit v1.2.3