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

Compare commits

base: public:1.2.1
Branches Tags
public:master
public:1.11.1 public:1.11.0 public:1.10.9 public:1.10.8 public:1.10.7 public:1.10.6 public:1.10.5 public:1.10.4 public:1.10.3 public:1.10.2 public:1.10.1 public:1.10.0 public:1.9.3 public:1.9.2 public:1.9.1 public:1.9.0 public:1.8.3 public:1.8.2 public:1.8.1 public:1.8.0 public:1.7.9 public:1.7.8 public:1.7.7 public:1.7.6 public:1.7.5 public:1.7.4 public:1.7.3 public:1.7.2 public:1.7.1 public:1.7.0 public:1.6.10 public:1.6.9 public:1.6.8 public:1.6.7 public:1.6.6 public:1.6.5 public:1.6.4 public:1.6.3 public:1.6.2 public:1.6.1 public:1.6.0 public:1.5.1 public:1.5.0 public:1.4.0 public:1.3.4 public:1.3.3 public:1.3.2 public:1.3.1 public:1.3.0 public:1.2.2 public:1.2.1 public:1.2.0 public:1.1.7 public:1.1.6 public:1.1.5 public:1.1.4 public:1.1.3 public:1.1.2 public:1.1.0 public:1.0.8 public:1.0.7 public:1.0.6 public:1.0.5 public:1.0.4 public:1.0.3 public:1.0.2 public:1.0.1 public:1.0.0
..
compare: public:1.2.2
Branches Tags
public:master
public:1.11.1 public:1.11.0 public:1.10.9 public:1.10.8 public:1.10.7 public:1.10.6 public:1.10.5 public:1.10.4 public:1.10.3 public:1.10.2 public:1.10.1 public:1.10.0 public:1.9.3 public:1.9.2 public:1.9.1 public:1.9.0 public:1.8.3 public:1.8.2 public:1.8.1 public:1.8.0 public:1.7.9 public:1.7.8 public:1.7.7 public:1.7.6 public:1.7.5 public:1.7.4 public:1.7.3 public:1.7.2 public:1.7.1 public:1.7.0 public:1.6.10 public:1.6.9 public:1.6.8 public:1.6.7 public:1.6.6 public:1.6.5 public:1.6.4 public:1.6.3 public:1.6.2 public:1.6.1 public:1.6.0 public:1.5.1 public:1.5.0 public:1.4.0 public:1.3.4 public:1.3.3 public:1.3.2 public:1.3.1 public:1.3.0 public:1.2.2 public:1.2.1 public:1.2.0 public:1.1.7 public:1.1.6 public:1.1.5 public:1.1.4 public:1.1.3 public:1.1.2 public:1.1.0 public:1.0.8 public:1.0.7 public:1.0.6 public:1.0.5 public:1.0.4 public:1.0.3 public:1.0.2 public:1.0.1 public:1.0.0

5 Commits
1.2.1 ... 1.2.2

Author SHA1 Message Date
dec05eba
3c8dd9c4db 1.2.2 2025-03-07 20:22:13 +01:00
dec05eba
c7fcf251e3 Fix shortcut keys changed 2025-03-07 20:21:25 +01:00
dec05eba
6d58b2495d Update screenshot image 2025-03-07 20:14:40 +01:00
dec05eba
347eced060 Change notification timeout 2025-03-07 17:38:50 +01:00
dec05eba
6449133c57 Update mglpp 2025-03-05 22:10:30 +01:00
6 changed files with 41 additions and 39 deletions
Expand all files Collapse all files

2
TODO
View File

@@ -137,4 +137,4 @@ Make input work with cjk input systems (such as fcitx).
System startup option should also support runit and some other init systems, not only soystemd. System startup option should also support runit and some other init systems, not only soystemd.
Allow using a hotkey such as printscreen or any other non-alphanumeric key without a modifier. Allow that in gsr-ui and gsr-global-hotkeys. Update the ui to match that.

2
depends/mglpp

Submodule depends/mglpp updated: 04a9fdec5a...b4ce16d4b9

BIN
images/screenshot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

4
meson.build
View File

@@ -1,4 +1,4 @@
project('gsr-ui', ['c', 'cpp'], version : '1.2.1', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends') project('gsr-ui', ['c', 'cpp'], version : '1.2.2', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
if get_option('buildtype') == 'debug' if get_option('buildtype') == 'debug'
add_project_arguments('-g3', language : ['c', 'cpp']) add_project_arguments('-g3', language : ['c', 'cpp'])
@@ -54,7 +54,7 @@ datadir = get_option('datadir')
gsr_ui_resources_path = join_paths(prefix, datadir, 'gsr-ui') gsr_ui_resources_path = join_paths(prefix, datadir, 'gsr-ui')
add_project_arguments('-DGSR_UI_VERSION="' + meson.project_version() + '"', language: ['c', 'cpp']) add_project_arguments('-DGSR_UI_VERSION="' + meson.project_version() + '"', language: ['c', 'cpp'])
add_project_arguments('-DGSR_FLATPAK_VERSION="5.1.6"', language: ['c', 'cpp']) add_project_arguments('-DGSR_FLATPAK_VERSION="5.1.7"', language: ['c', 'cpp'])
executable( executable(
meson.project_name(), meson.project_name(),

2
project.conf
View File

@@ -1,7 +1,7 @@
[package] [package]
name = "gsr-ui" name = "gsr-ui"
type = "executable" type = "executable"
version = "1.2.1" version = "1.2.2"
platforms = ["posix"] platforms = ["posix"]
[lang.cpp] [lang.cpp]

70
src/Overlay.cpp
View File

@@ -44,6 +44,8 @@ namespace gsr {
static const double force_window_on_top_timeout_seconds = 1.0; static const double force_window_on_top_timeout_seconds = 1.0;
static const double replay_status_update_check_timeout_seconds = 1.5; static const double replay_status_update_check_timeout_seconds = 1.5;
static const double replay_saving_notification_timeout_seconds = 0.5; static const double replay_saving_notification_timeout_seconds = 0.5;
static const double notification_timeout_seconds = 2.0;
static const double notification_error_timeout_seconds = 5.0;
static mgl::Texture texture_from_ximage(XImage *img) { static mgl::Texture texture_from_ximage(XImage *img) {
uint8_t *texture_data = (uint8_t*)malloc(img->width * img->height * 3); uint8_t *texture_data = (uint8_t*)malloc(img->width * img->height * 3);
@@ -1071,7 +1073,7 @@ namespace gsr {
replay_settings_page->on_config_changed = [this]() { replay_settings_page->on_config_changed = [this]() {
replay_startup_mode = replay_startup_string_to_type(config.replay_config.turn_on_replay_automatically_mode.c_str()); replay_startup_mode = replay_startup_string_to_type(config.replay_config.turn_on_replay_automatically_mode.c_str());
if(recording_status == RecordingStatus::REPLAY) if(recording_status == RecordingStatus::REPLAY)
show_notification("Replay settings have been modified.\nYou may need to restart replay to apply the changes.", 5.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY); show_notification("Replay settings have been modified.\nYou may need to restart replay to apply the changes.", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
}; };
page_stack.push(std::move(replay_settings_page)); page_stack.push(std::move(replay_settings_page));
} else if(id == "save") { } else if(id == "save") {
@@ -1097,7 +1099,7 @@ namespace gsr {
auto record_settings_page = std::make_unique<SettingsPage>(SettingsPage::Type::RECORD, &gsr_info, config, &page_stack); auto record_settings_page = std::make_unique<SettingsPage>(SettingsPage::Type::RECORD, &gsr_info, config, &page_stack);
record_settings_page->on_config_changed = [this]() { record_settings_page->on_config_changed = [this]() {
if(recording_status == RecordingStatus::RECORD) if(recording_status == RecordingStatus::RECORD)
show_notification("Recording settings have been modified.\nYou may need to restart recording to apply the changes.", 5.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD); show_notification("Recording settings have been modified.\nYou may need to restart recording to apply the changes.", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD);
}; };
page_stack.push(std::move(record_settings_page)); page_stack.push(std::move(record_settings_page));
} else if(id == "pause") { } else if(id == "pause") {
@@ -1121,7 +1123,7 @@ namespace gsr {
auto stream_settings_page = std::make_unique<SettingsPage>(SettingsPage::Type::STREAM, &gsr_info, config, &page_stack); auto stream_settings_page = std::make_unique<SettingsPage>(SettingsPage::Type::STREAM, &gsr_info, config, &page_stack);
stream_settings_page->on_config_changed = [this]() { stream_settings_page->on_config_changed = [this]() {
if(recording_status == RecordingStatus::STREAM) if(recording_status == RecordingStatus::STREAM)
show_notification("Streaming settings have been modified.\nYou may need to restart streaming to apply the changes.", 5.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM); show_notification("Streaming settings have been modified.\nYou may need to restart streaming to apply the changes.", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM);
}; };
page_stack.push(std::move(stream_settings_page)); page_stack.push(std::move(stream_settings_page));
} else if(id == "start") { } else if(id == "start") {
@@ -1151,12 +1153,12 @@ namespace gsr {
if(exit_status == 127) { if(exit_status == 127) {
if(enable) if(enable)
show_notification("Failed to add GPU Screen Recorder to system startup.\nThis option only works on systems that use systemd.\nYou have to manually add \"gsr-ui\" to system startup on systems that uses another init system.", 10.0, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::NONE); show_notification("Failed to add GPU Screen Recorder to system startup.\nThis option only works on systems that use systemd.\nYou have to manually add \"gsr-ui\" to system startup on systems that uses another init system.", 7.0, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::NONE);
} else { } else {
if(enable) if(enable)
show_notification("Failed to add GPU Screen Recorder to system startup", 3.0, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::NONE); show_notification("Failed to add GPU Screen Recorder to system startup", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::NONE);
else else
show_notification("Failed to remove GPU Screen Recorder from system startup", 3.0, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::NONE); show_notification("Failed to remove GPU Screen Recorder from system startup", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::NONE);
} }
}; };
@@ -1352,10 +1354,10 @@ namespace gsr {
if(paused) { if(paused) {
update_ui_recording_unpaused(); update_ui_recording_unpaused();
show_notification("Recording has been unpaused", 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD); show_notification("Recording has been unpaused", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD);
} else { } else {
update_ui_recording_paused(); update_ui_recording_paused();
show_notification("Recording has been paused", 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD); show_notification("Recording has been paused", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD);
} }
kill(gpu_screen_recorder_process, SIGUSR2); kill(gpu_screen_recorder_process, SIGUSR2);
@@ -1539,7 +1541,7 @@ namespace gsr {
case NotificationType::STREAM: case NotificationType::STREAM:
break; break;
} }
show_notification(text.c_str(), 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, notification_type); show_notification(text.c_str(), notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, notification_type);
} }
void Overlay::on_replay_saved(const char *replay_saved_filepath) { void Overlay::on_replay_saved(const char *replay_saved_filepath) {
@@ -1548,14 +1550,14 @@ namespace gsr {
save_video_in_current_game_directory(replay_saved_filepath, NotificationType::REPLAY); save_video_in_current_game_directory(replay_saved_filepath, NotificationType::REPLAY);
} else { } else {
const std::string text = "Saved replay to '" + filepath_get_filename(replay_saved_filepath) + "'"; const std::string text = "Saved replay to '" + filepath_get_filename(replay_saved_filepath) + "'";
show_notification(text.c_str(), 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY); show_notification(text.c_str(), notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
} }
} }
void Overlay::update_gsr_replay_save() { void Overlay::update_gsr_replay_save() {
if(replay_save_show_notification && replay_save_clock.get_elapsed_time_seconds() >= replay_saving_notification_timeout_seconds) { if(replay_save_show_notification && replay_save_clock.get_elapsed_time_seconds() >= replay_saving_notification_timeout_seconds) {
replay_save_show_notification = false; replay_save_show_notification = false;
show_notification("Saving replay, this might take some time", 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY); show_notification("Saving replay, this might take some time", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
} }
if(gpu_screen_recorder_process_output_file) { if(gpu_screen_recorder_process_output_file) {
@@ -1598,10 +1600,10 @@ namespace gsr {
update_ui_replay_stopped(); update_ui_replay_stopped();
if(exit_code == 0) { if(exit_code == 0) {
if(config.replay_config.show_replay_stopped_notifications) if(config.replay_config.show_replay_stopped_notifications)
show_notification("Replay stopped", 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY); show_notification("Replay stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
} else { } else {
fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code); fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code);
show_notification("Replay stopped because of an error. Verify if settings are correct", 3.0, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::REPLAY); show_notification("Replay stopped because of an error. Verify if settings are correct", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::REPLAY);
} }
break; break;
} }
@@ -1614,10 +1616,10 @@ namespace gsr {
update_ui_streaming_stopped(); update_ui_streaming_stopped();
if(exit_code == 0) { if(exit_code == 0) {
if(config.streaming_config.show_streaming_stopped_notifications) if(config.streaming_config.show_streaming_stopped_notifications)
show_notification("Streaming has stopped", 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM); show_notification("Streaming has stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM);
} else { } else {
fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code); fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code);
show_notification("Streaming stopped because of an error. Verify if settings are correct", 3.0, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::STREAM); show_notification("Streaming stopped because of an error. Verify if settings are correct", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::STREAM);
} }
break; break;
} }
@@ -1646,11 +1648,11 @@ namespace gsr {
save_video_in_current_game_directory(screenshot_filepath.c_str(), NotificationType::SCREENSHOT); save_video_in_current_game_directory(screenshot_filepath.c_str(), NotificationType::SCREENSHOT);
} else { } else {
const std::string text = "Saved screenshot to '" + filepath_get_filename(screenshot_filepath.c_str()) + "'"; const std::string text = "Saved screenshot to '" + filepath_get_filename(screenshot_filepath.c_str()) + "'";
show_notification(text.c_str(), 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::SCREENSHOT); show_notification(text.c_str(), notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::SCREENSHOT);
} }
} else { } else {
fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_screenshot_process, exit_code); fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_screenshot_process, exit_code);
show_notification("Failed to take a screenshot. Verify if settings are correct", 3.0, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::SCREENSHOT); show_notification("Failed to take a screenshot. Verify if settings are correct", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::SCREENSHOT);
} }
gpu_screen_recorder_screenshot_process = -1; gpu_screen_recorder_screenshot_process = -1;
@@ -1747,11 +1749,11 @@ namespace gsr {
save_video_in_current_game_directory(record_filepath.c_str(), NotificationType::RECORD); save_video_in_current_game_directory(record_filepath.c_str(), NotificationType::RECORD);
} else { } else {
const std::string text = "Saved recording to '" + filepath_get_filename(record_filepath.c_str()) + "'"; const std::string text = "Saved recording to '" + filepath_get_filename(record_filepath.c_str()) + "'";
show_notification(text.c_str(), 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD); show_notification(text.c_str(), notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD);
} }
} else { } else {
fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code); fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code);
show_notification("Failed to start/save recording. Verify if settings are correct", 3.0, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::RECORD); show_notification("Failed to start/save recording. Verify if settings are correct", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::RECORD);
} }
} }
@@ -1947,10 +1949,10 @@ namespace gsr {
case RecordingStatus::REPLAY: case RecordingStatus::REPLAY:
break; break;
case RecordingStatus::RECORD: case RecordingStatus::RECORD:
show_notification("Unable to start replay when recording.\nStop recording before starting replay.", 5.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD); show_notification("Unable to start replay when recording.\nStop recording before starting replay.", notification_error_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD);
return false; return false;
case RecordingStatus::STREAM: case RecordingStatus::STREAM:
show_notification("Unable to start replay when streaming.\nStop streaming before starting replay.", 5.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM); show_notification("Unable to start replay when streaming.\nStop streaming before starting replay.", notification_error_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM);
return false; return false;
} }
@@ -1977,7 +1979,7 @@ namespace gsr {
// TODO: Show this with a slight delay to make sure it doesn't show up in the video // TODO: Show this with a slight delay to make sure it doesn't show up in the video
if(!disable_notification && config.replay_config.show_replay_stopped_notifications) if(!disable_notification && config.replay_config.show_replay_stopped_notifications)
show_notification("Replay stopped", 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY); show_notification("Replay stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
return true; return true;
} }
@@ -1985,7 +1987,7 @@ namespace gsr {
if(!validate_capture_target(gsr_info, config.replay_config.record_options.record_area_option)) { if(!validate_capture_target(gsr_info, config.replay_config.record_options.record_area_option)) {
char err_msg[256]; char err_msg[256];
snprintf(err_msg, sizeof(err_msg), "Failed to start replay, capture target \"%s\" is invalid. Please change capture target in settings", config.replay_config.record_options.record_area_option.c_str()); snprintf(err_msg, sizeof(err_msg), "Failed to start replay, capture target \"%s\" is invalid. Please change capture target in settings", config.replay_config.record_options.record_area_option.c_str());
show_notification(err_msg, 3.0, mgl::Color(255, 0, 0, 0), mgl::Color(255, 0, 0, 0), NotificationType::REPLAY); show_notification(err_msg, notification_error_timeout_seconds, mgl::Color(255, 0, 0, 0), mgl::Color(255, 0, 0, 0), NotificationType::REPLAY);
return false; return false;
} }
@@ -2060,7 +2062,7 @@ namespace gsr {
// program and start another one. This can also be used to check when the notification has finished by checking with waitpid NOWAIT // program and start another one. This can also be used to check when the notification has finished by checking with waitpid NOWAIT
// to see when the program has exit. // to see when the program has exit.
if(!disable_notification && config.replay_config.show_replay_started_notifications) if(!disable_notification && config.replay_config.show_replay_started_notifications)
show_notification("Replay has started", 3.0, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::REPLAY); show_notification("Replay has started", notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::REPLAY);
return true; return true;
} }
@@ -2071,10 +2073,10 @@ namespace gsr {
case RecordingStatus::RECORD: case RecordingStatus::RECORD:
break; break;
case RecordingStatus::REPLAY: case RecordingStatus::REPLAY:
show_notification("Unable to start recording when replay is turned on.\nTurn off replay before starting recording.", 5.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY); show_notification("Unable to start recording when replay is turned on.\nTurn off replay before starting recording.", notification_error_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
return; return;
case RecordingStatus::STREAM: case RecordingStatus::STREAM:
show_notification("Unable to start recording when streaming.\nStop streaming before starting recording.", 5.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM); show_notification("Unable to start recording when streaming.\nStop streaming before starting recording.", notification_error_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM);
return; return;
} }
@@ -2106,7 +2108,7 @@ namespace gsr {
if(!validate_capture_target(gsr_info, config.record_config.record_options.record_area_option)) { if(!validate_capture_target(gsr_info, config.record_config.record_options.record_area_option)) {
char err_msg[256]; char err_msg[256];
snprintf(err_msg, sizeof(err_msg), "Failed to start recording, capture target \"%s\" is invalid. Please change capture target in settings", config.record_config.record_options.record_area_option.c_str()); snprintf(err_msg, sizeof(err_msg), "Failed to start recording, capture target \"%s\" is invalid. Please change capture target in settings", config.record_config.record_options.record_area_option.c_str());
show_notification(err_msg, 3.0, mgl::Color(255, 0, 0, 0), mgl::Color(255, 0, 0, 0), NotificationType::RECORD); show_notification(err_msg, notification_error_timeout_seconds, mgl::Color(255, 0, 0, 0), mgl::Color(255, 0, 0, 0), NotificationType::RECORD);
return; return;
} }
@@ -2168,7 +2170,7 @@ namespace gsr {
// 2... // 2...
// 1... // 1...
if(config.record_config.show_recording_started_notifications) if(config.record_config.show_recording_started_notifications)
show_notification("Recording has started", 3.0, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD); show_notification("Recording has started", notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD);
} }
static std::string streaming_get_url(const Config &config) { static std::string streaming_get_url(const Config &config) {
@@ -2209,10 +2211,10 @@ namespace gsr {
case RecordingStatus::STREAM: case RecordingStatus::STREAM:
break; break;
case RecordingStatus::REPLAY: case RecordingStatus::REPLAY:
show_notification("Unable to start streaming when replay is turned on.\nTurn off replay before starting streaming.", 5.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY); show_notification("Unable to start streaming when replay is turned on.\nTurn off replay before starting streaming.", notification_error_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
return; return;
case RecordingStatus::RECORD: case RecordingStatus::RECORD:
show_notification("Unable to start streaming when recording.\nStop recording before starting streaming.", 5.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD); show_notification("Unable to start streaming when recording.\nStop recording before starting streaming.", notification_error_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD);
return; return;
} }
@@ -2235,14 +2237,14 @@ namespace gsr {
// TODO: Show this with a slight delay to make sure it doesn't show up in the video // TODO: Show this with a slight delay to make sure it doesn't show up in the video
if(config.streaming_config.show_streaming_stopped_notifications) if(config.streaming_config.show_streaming_stopped_notifications)
show_notification("Streaming has stopped", 3.0, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM); show_notification("Streaming has stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM);
return; return;
} }
if(!validate_capture_target(gsr_info, config.streaming_config.record_options.record_area_option)) { if(!validate_capture_target(gsr_info, config.streaming_config.record_options.record_area_option)) {
char err_msg[256]; char err_msg[256];
snprintf(err_msg, sizeof(err_msg), "Failed to start streaming, capture target \"%s\" is invalid. Please change capture target in settings", config.streaming_config.record_options.record_area_option.c_str()); snprintf(err_msg, sizeof(err_msg), "Failed to start streaming, capture target \"%s\" is invalid. Please change capture target in settings", config.streaming_config.record_options.record_area_option.c_str());
show_notification(err_msg, 3.0, mgl::Color(255, 0, 0, 0), mgl::Color(255, 0, 0, 0), NotificationType::STREAM); show_notification(err_msg, notification_error_timeout_seconds, mgl::Color(255, 0, 0, 0), mgl::Color(255, 0, 0, 0), NotificationType::STREAM);
return; return;
} }
@@ -2309,7 +2311,7 @@ namespace gsr {
// program and start another one. This can also be used to check when the notification has finished by checking with waitpid NOWAIT // program and start another one. This can also be used to check when the notification has finished by checking with waitpid NOWAIT
// to see when the program has exit. // to see when the program has exit.
if(config.streaming_config.show_streaming_started_notifications) if(config.streaming_config.show_streaming_started_notifications)
show_notification("Streaming has started", 3.0, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::STREAM); show_notification("Streaming has started", notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::STREAM);
} }
void Overlay::on_press_take_screenshot() { void Overlay::on_press_take_screenshot() {
@@ -2321,7 +2323,7 @@ namespace gsr {
if(!validate_capture_target(gsr_info, config.screenshot_config.record_area_option)) { if(!validate_capture_target(gsr_info, config.screenshot_config.record_area_option)) {
char err_msg[256]; char err_msg[256];
snprintf(err_msg, sizeof(err_msg), "Failed to take a screenshot, capture target \"%s\" is invalid. Please change capture target in settings", config.screenshot_config.record_area_option.c_str()); snprintf(err_msg, sizeof(err_msg), "Failed to take a screenshot, capture target \"%s\" is invalid. Please change capture target in settings", config.screenshot_config.record_area_option.c_str());
show_notification(err_msg, 3.0, mgl::Color(255, 0, 0, 0), mgl::Color(255, 0, 0, 0), NotificationType::SCREENSHOT); show_notification(err_msg, notification_error_timeout_seconds, mgl::Color(255, 0, 0, 0), mgl::Color(255, 0, 0, 0), NotificationType::SCREENSHOT);
return; return;
} }