Tobias Kortkamp
3945e0e668
Changes: https://github.com/irtimmer/moonlight-embedded/releases/tag/v2.4.11
107 lines
3.7 KiB
C
107 lines
3.7 KiB
C
--- src/main.c.orig 2020-03-09 19:33:27 UTC
|
|
+++ src/main.c
|
|
@@ -91,7 +91,6 @@ static void stream(PSERVER_DATA server, PCONFIGURATION
|
|
}
|
|
|
|
int gamepads = 0;
|
|
- gamepads += evdev_gamepads;
|
|
#ifdef HAVE_SDL
|
|
gamepads += sdl_gamepads;
|
|
#endif
|
|
@@ -121,21 +120,11 @@ static void stream(PSERVER_DATA server, PCONFIGURATION
|
|
connection_debug = true;
|
|
}
|
|
|
|
- if (IS_EMBEDDED(system))
|
|
- loop_init();
|
|
-
|
|
platform_start(system);
|
|
LiStartConnection(&server->serverInfo, &config->stream, &connection_callbacks, platform_get_video(system), platform_get_audio(system, config->audio_device), NULL, drFlags, config->audio_device, 0);
|
|
|
|
- if (IS_EMBEDDED(system)) {
|
|
- if (!config->viewonly)
|
|
- evdev_start();
|
|
- loop_main();
|
|
- if (!config->viewonly)
|
|
- evdev_stop();
|
|
- }
|
|
#ifdef HAVE_SDL
|
|
- else if (system == SDL)
|
|
+ if (system == SDL)
|
|
sdl_loop();
|
|
#endif
|
|
|
|
@@ -188,7 +177,6 @@ static void help() {
|
|
printf("\t-surround\t\tStream 5.1 surround sound (requires GFE 2.7)\n");
|
|
printf("\t-keydir <directory>\tLoad encryption keys from directory\n");
|
|
printf("\t-mapping <file>\t\tUse <file> as gamepad mappings configuration file\n");
|
|
- printf("\t-platform <system>\tSpecify system used for audio, video and input: pi/imx/aml/rk/x11/x11_vdpau/sdl/fake (default auto)\n");
|
|
printf("\t-unsupported\t\tTry streaming if GFE version or options are unsupported\n");
|
|
printf("\t-quitappafter\t\tSend quit app request to remote after quitting session\n");
|
|
printf("\t-viewonly\t\tDisable all input processing (view-only mode)\n");
|
|
@@ -228,8 +216,6 @@ int main(int argc, char* argv[]) {
|
|
exit(-1);
|
|
}
|
|
|
|
- evdev_create(config.inputs[0], NULL, config.debug_level > 0);
|
|
- evdev_map(config.inputs[0]);
|
|
exit(0);
|
|
}
|
|
|
|
@@ -240,12 +226,8 @@ int main(int argc, char* argv[]) {
|
|
exit(-1);
|
|
}
|
|
config.address[0] = 0;
|
|
- printf("Searching for server...\n");
|
|
- gs_discover_server(config.address);
|
|
- if (config.address[0] == 0) {
|
|
- fprintf(stderr, "Autodiscovery failed. Specify an IP address next time.\n");
|
|
- exit(-1);
|
|
- }
|
|
+ fprintf(stderr, "Autodiscovery unsupported. Specify an IP address next time.\n");
|
|
+ exit(-1);
|
|
}
|
|
|
|
char host_config_file[128];
|
|
@@ -304,39 +286,8 @@ int main(int argc, char* argv[]) {
|
|
if (config.debug_level > 0)
|
|
printf("View-only mode enabled, no input will be sent to the host computer\n");
|
|
} else {
|
|
- if (IS_EMBEDDED(system)) {
|
|
- char* mapping_env = getenv("SDL_GAMECONTROLLERCONFIG");
|
|
- if (config.mapping == NULL && mapping_env == NULL) {
|
|
- fprintf(stderr, "Please specify mapping file as default mapping could not be found.\n");
|
|
- exit(-1);
|
|
- }
|
|
-
|
|
- struct mapping* mappings = NULL;
|
|
- if (config.mapping != NULL)
|
|
- mappings = mapping_load(config.mapping, config.debug_level > 0);
|
|
-
|
|
- if (mapping_env != NULL) {
|
|
- struct mapping* map = mapping_parse(mapping_env);
|
|
- map->next = mappings;
|
|
- mappings = map;
|
|
- }
|
|
-
|
|
- for (int i=0;i<config.inputsCount;i++) {
|
|
- if (config.debug_level > 0)
|
|
- printf("Add input %s...\n", config.inputs[i]);
|
|
-
|
|
- evdev_create(config.inputs[i], mappings, config.debug_level > 0);
|
|
- }
|
|
-
|
|
- udev_init(!inputAdded, mappings, config.debug_level > 0);
|
|
- evdev_init();
|
|
- rumble_handler = evdev_rumble;
|
|
- #ifdef HAVE_LIBCEC
|
|
- cec_init();
|
|
- #endif /* HAVE_LIBCEC */
|
|
- }
|
|
#ifdef HAVE_SDL
|
|
- else if (system == SDL) {
|
|
+ if (system == SDL) {
|
|
if (config.inputsCount > 0) {
|
|
fprintf(stderr, "You can't select input devices as SDL will automatically use all available controllers\n");
|
|
exit(-1);
|