moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-07-01 23:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Provide gamepad mask at startup

Browse Source
This commit is contained in:
Iwan Timmer 2018-04-08 10:18:13 +00:00
parent dcda1a5d13
commit c8195f796c
8 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libgamestream/CMakeLists.txt
View File

@ -1,4 +1,4 @@
set(SO_VERSION 3)
set(SO_VERSION 4)
find_package(LibUUID REQUIRED)
find_package(Threads REQUIRED)

4
libgamestream/client.c
View File

@ -650,7 +650,7 @@ int gs_applist(PSERVER_DATA server, PAPP_LIST *list) {
return ret;
}
int gs_start_app(PSERVER_DATA server, STREAM_CONFIGURATION *config, int appId, bool sops, bool localaudio) {
int gs_start_app(PSERVER_DATA server, STREAM_CONFIGURATION *config, int appId, bool sops, bool localaudio, int gamepad_mask) {
int ret = GS_OK;
uuid_t uuid;
char* result = NULL;
@ -689,7 +689,7 @@ int gs_start_app(PSERVER_DATA server, STREAM_CONFIGURATION *config, int appId, b
if (server->currentGame == 0) {
int channelCounnt = config->audioConfiguration == AUDIO_CONFIGURATION_STEREO ? CHANNEL_COUNT_STEREO : CHANNEL_COUNT_51_SURROUND;
int mask = config->audioConfiguration == AUDIO_CONFIGURATION_STEREO ? CHANNEL_MASK_STEREO : CHANNEL_MASK_51_SURROUND;
snprintf(url, sizeof(url), "https://%s:47984/launch?uniqueid=%s&uuid=%s&appid=%d&mode=%dx%dx%d&additionalStates=1&sops=%d&rikey=%s&rikeyid=%d&localAudioPlayMode=%d&surroundAudioInfo=%d", server->serverInfo.address, unique_id, uuid_str, appId, config->width, config->height, config->fps, sops, rikey_hex, rikeyid, localaudio, (mask << 16) + channelCounnt);
snprintf(url, sizeof(url), "https://%s:47984/launch?uniqueid=%s&uuid=%s&appid=%d&mode=%dx%dx%d&additionalStates=1&sops=%d&rikey=%s&rikeyid=%d&localAudioPlayMode=%d&surroundAudioInfo=%d&remoteControllersBitmap=%d&gcmap=%d", server->serverInfo.address, unique_id, uuid_str, appId, config->width, config->height, config->fps, sops, rikey_hex, rikeyid, localaudio, (mask << 16) + channelCounnt, gamepad_mask, gamepad_mask);
} else
snprintf(url, sizeof(url), "https://%s:47984/resume?uniqueid=%s&uuid=%s&rikey=%s&rikeyid=%d", server->serverInfo.address, unique_id, uuid_str, rikey_hex, rikeyid);

2
libgamestream/client.h
View File

@ -42,7 +42,7 @@ typedef struct _SERVER_DATA {
} SERVER_DATA, *PSERVER_DATA;
int gs_init(PSERVER_DATA server, char* address, const char *keyDirectory, int logLevel, bool unsupported);
int gs_start_app(PSERVER_DATA server, PSTREAM_CONFIGURATION config, int appId, bool sops, bool localaudio);
int gs_start_app(PSERVER_DATA server, PSTREAM_CONFIGURATION config, int appId, bool sops, bool localaudio, int gamepad_mask);
int gs_applist(PSERVER_DATA server, PAPP_LIST *app_list);
int gs_unpair(PSERVER_DATA server);
int gs_pair(PSERVER_DATA server, char* pin);

5
src/input/evdev.c
View File

@ -91,6 +91,8 @@ static bool* currentReverse;
static bool grabbingDevices;
int evdev_gamepads = 0;
#define QUIT_MODIFIERS (MODIFIER_SHIFT|MODIFIER_ALT|MODIFIER_CTRL)
#define QUIT_KEY KEY_Q
#define QUIT_BUTTONS (PLAY_FLAG|BACK_FLAG|LB_FLAG|RB_FLAG)
@ -495,6 +497,9 @@ void evdev_create(const char* device, struct mapping* mappings, bool verbose) {
mappings = default_mapping;
}
if (!is_keyboard && !is_mouse)
evdev_gamepads++;
int dev = numDevices;
numDevices++;

2
src/input/evdev.h
View File

@ -19,6 +19,8 @@
#include "mapping.h"
extern int evdev_gamepads;
void evdev_create(const char* device, struct mapping* mappings, bool verbose);
void evdev_loop();

3
src/input/sdl.c
View File

@ -42,6 +42,8 @@ static GAMEPAD_STATE gamepads[4];
static int keyboard_modifiers;
static int activeGamepadMask = 0;
int sdl_gamepads = 0;
void sdlinput_init(char* mappings) {
memset(gamepads, 0, sizeof(gamepads));
@ -50,6 +52,7 @@ void sdlinput_init(char* mappings) {
for (int i = 0; i < SDL_NumJoysticks(); ++i) {
if (SDL_IsGameController(i)) {
sdl_gamepads++;
if (!SDL_GameControllerOpen(i)) {
fprintf(stderr, "Could not open gamecontroller %i: %s\n", i, SDL_GetError());
}

2
src/input/sdl.h
View File

@ -20,6 +20,8 @@
#include <stdbool.h>
#include <SDL.h>
extern int sdl_gamepads;
static const short keyCodes1[] = {
0, //SDLK_EXCLAIM
0, //SDLK_QUOTEDBL

11
src/main.c
View File

@ -90,7 +90,16 @@ static void stream(PSERVER_DATA server, PCONFIGURATION config, enum platform sys
exit(-1);
}
int ret = gs_start_app(server, &config->stream, appId, config->sops, config->localaudio);
int gamepads = 0;
gamepads += evdev_gamepads;
#ifdef HAVE_SDL
gamepads += sdl_gamepads;
#endif
int gamepad_mask;
for (int i = 0; i < gamepads && i < 4; i++)
gamepad_mask = (gamepad_mask << 1) + 1;
int ret = gs_start_app(server, &config->stream, appId, config->sops, config->localaudio, gamepad_mask);
if (ret < 0) {
if (ret == GS_NOT_SUPPORTED_4K)
fprintf(stderr, "Server doesn't support 4K\n");