izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed unspecified monitor streaming the whole X

Browse Source
This commit is contained in:
kiralycraft
2021-02-28 17:56:38 +02:00
parent b336bf2fcb
commit fe3784454a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunshine/config.cpp
+4 -1
View File
@@ -105,7 +105,8 @@ video_t video {
{}, // encoder {}, // encoder
{}, // adapter_name {}, // adapter_name
{} // output_name {}, // output_name
-1
}; };
audio_t audio {}; audio_t audio {};
@@ -371,6 +372,8 @@ void apply_config(std::unordered_map<std::string, std::string> &&vars) {
string_f(vars, "audio_sink", audio.sink); string_f(vars, "audio_sink", audio.sink);
int_between_f(vars, "linux_monitor_id", video.linux_monitor_id, { 0, 32 });
string_restricted_f(vars, "origin_pin_allowed", nvhttp.origin_pin_allowed, { string_restricted_f(vars, "origin_pin_allowed", nvhttp.origin_pin_allowed, {
"pc"sv, "lan"sv, "wan"sv "pc"sv, "lan"sv, "wan"sv
}); });
sunshine/platform/linux/display.cpp
+2 -1
View File
@@ -202,7 +202,8 @@ struct x11_attr_t: public display_t
if (streamedMonitor != -1) //If the value has been set at all if (streamedMonitor != -1) //If the value has been set at all
{ {
BOOST_LOG(warning) << "Configuring selected monitor to stream. If it fails here, you may need Xrandr >= 1.5"sv;
BOOST_LOG(info) << "Configuring selected monitor ("<< streamedMonitor<<") to stream. If it fails here, you may need Xrandr >= 1.5"sv;
XRRScreenResources *screenr = XRRGetScreenResources(displayDisplay, xwindow); XRRScreenResources *screenr = XRRGetScreenResources(displayDisplay, xwindow);
// This is the key right here. Use XRRScreenResources::noutput // This is the key right here. Use XRRScreenResources::noutput
int output = screenr->noutput; int output = screenr->noutput;