Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sunshine.conf and apps.json on user's home config dir #269

Merged
merged 8 commits into from
Aug 6, 2022
Merged

sunshine.conf and apps.json on user's home config dir #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54c3390
Config and app.json on user home config
istori1 Jul 28, 2022
a9157d4
Update config.cpp
istori1 Jul 28, 2022
df286ea
Update config.cpp
istori1 Jul 29, 2022
d55def3
Merge branch 'nightly' into patch-1
istori1 Jul 29, 2022
d900f4a
Merge branch 'nightly' into patch-1
istori1 Jul 30, 2022
b7944b3
Merge branch 'nightly' into patch-1
istori1 Aug 1, 2022
2b24cf6
Merge branch 'nightly' into patch-1
istori1 Aug 5, 2022
a6d6b48
Update dev.lizardbyte.sunshine.yml
istori1 Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ modules:
- /share/ffmpeg/examples
sources:
- type: archive
url: https://ffmpeg.org/releases/ffmpeg-4.4.2.tar.xz
url: http://archive.ubuntu.com/ubuntu/pool/universe/f/ffmpeg/ffmpeg_4.4.2.orig.tar.xz
sha256: af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93
modules:
- name: vmaf
Expand Down
18 changes: 9 additions & 9 deletions sunshine/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ using namespace std::literals;
#define PRIVATE_KEY_FILE CA_DIR "/cakey.pem"
#define CERTIFICATE_FILE CA_DIR "/cacert.pem"

#define APPS_JSON_PATH SUNSHINE_CONFIG_DIR "/apps.json"
#define APPS_JSON_PATH platf::appdata().string() + "/apps.json"
namespace config {

namespace nv {
Expand Down Expand Up @@ -286,14 +286,14 @@ input_t input {
};

sunshine_t sunshine {
2, // min_log_level
0, // flags
{}, // User file
{}, // Username
{}, // Password
{}, // Password Salt
SUNSHINE_CONFIG_DIR "/sunshine.conf", // config file
{}, // cmd args
2, // min_log_level
0, // flags
{}, // User file
{}, // Username
{}, // Password
{}, // Password Salt
platf::appdata().string() + "/sunshine.conf", // config file
{}, // cmd args
47989,
};

Expand Down