diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | include/Overlay.hpp | 1 | ||||
| -rw-r--r-- | src/Overlay.cpp | 50 |
3 files changed, 47 insertions, 6 deletions
@@ -191,3 +191,5 @@ Create window as a real overlay window, using layer shell protocol, when possibl Add timeout option for screenshots. Add a window that shows a warning for wayland users, that wayland doesn't support this software and if they experience issues then they should use x11 instead. + +Add a window that shows a warning if gpu video encoding isn't supported. diff --git a/include/Overlay.hpp b/include/Overlay.hpp index 5f97e5f..3de89c2 100644 --- a/include/Overlay.hpp +++ b/include/Overlay.hpp @@ -91,6 +91,7 @@ namespace gsr { void save_video_in_current_game_directory(const char *video_filepath, NotificationType notification_type); void on_replay_saved(const char *replay_saved_filepath); void process_gsr_output(); + void on_gsr_process_error(int exit_code, NotificationType notification_type); void update_gsr_process_status(); void update_gsr_screenshot_process_status(); diff --git a/src/Overlay.cpp b/src/Overlay.cpp index dbf71c7..c3ae5ae 100644 --- a/src/Overlay.cpp +++ b/src/Overlay.cpp @@ -1885,6 +1885,35 @@ namespace gsr { } } + void Overlay::on_gsr_process_error(int exit_code, NotificationType notification_type) { + fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code); + if(exit_code == 50) { + show_notification("Desktop portal capture failed.\nEither you canceled the desktop portal or your Wayland compositor doesn't support desktop portal capture\nor it's incorrectly setup on your system", notification_error_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), notification_type); + } else if(exit_code == 60) { + show_notification("Stopped capture because the user canceled the desktop portal", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), notification_type); + } else { + const char *prefix = ""; + switch(notification_type) { + case NotificationType::NONE: + case NotificationType::SCREENSHOT: + break; + case NotificationType::RECORD: + prefix = "Failed to start/save recording"; + break; + case NotificationType::REPLAY: + prefix = "Replay stopped because of an error"; + break; + case NotificationType::STREAM: + prefix = "Streaming stopped because of an error"; + break; + } + + char msg[256]; + snprintf(msg, sizeof(msg), "%s. Verify if settings are correct", prefix); + show_notification(msg, notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), notification_type); + } + } + void Overlay::update_gsr_process_status() { if(gpu_screen_recorder_process <= 0) return; @@ -1911,8 +1940,7 @@ namespace gsr { if(config.replay_config.show_replay_stopped_notifications) show_notification("Replay stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY); } else { - 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", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::REPLAY); + on_gsr_process_error(exit_code, NotificationType::REPLAY); } break; } @@ -1927,8 +1955,7 @@ namespace gsr { if(config.streaming_config.show_streaming_stopped_notifications) show_notification("Streaming has stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM); } else { - 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", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::STREAM); + on_gsr_process_error(exit_code, NotificationType::STREAM); } break; } @@ -2060,8 +2087,7 @@ namespace gsr { show_notification(msg, notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD, recording_capture_target.c_str()); } } else { - 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", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::RECORD); + on_gsr_process_error(exit_code, NotificationType::RECORD); } update_ui_recording_stopped(); replay_recording = false; @@ -2185,6 +2211,8 @@ namespace gsr { for(const AudioTrack &audio_track : audio_tracks) { std::string audio_track_merged; + int num_app_audio = 0; + for(const std::string &audio_input_name : audio_track.audio_inputs) { std::string new_audio_input_name = audio_input_name; const bool is_app_audio = starts_with(new_audio_input_name, "app:"); @@ -2194,12 +2222,22 @@ namespace gsr { if(is_app_audio && audio_track.application_audio_invert) new_audio_input_name.replace(0, 4, "app-inverse:"); + if(is_app_audio) + ++num_app_audio; + if(!audio_track_merged.empty()) audio_track_merged += "|"; audio_track_merged += new_audio_input_name; } + if(num_app_audio == 0 && audio_track.application_audio_invert) { + if(!audio_track_merged.empty()) + audio_track_merged += "|"; + + audio_track_merged += "app-inverse:"; + } + if(!audio_track_merged.empty()) result.push_back(std::move(audio_track_merged)); } |