From 05add27e805953aff213383682ac6652ee328a97 Mon Sep 17 00:00:00 2001 From: Iwan Timmer Date: Mon, 3 Aug 2015 11:52:14 +0200 Subject: [PATCH] Update documentation --- CMakeLists.txt | 4 ++++ README.md | 15 +++++++++++---- src/main.c | 23 ++++++++++++++--------- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40773b2..e2d994c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,10 @@ if (AVCODEC_FOUND AND AVUTIL_FOUND AND SWSCALE_FOUND AND SDL_FOUND) list(APPEND MOONLIGHT_DEFINITIONS HAVE_SDL) endif() +if (BROADCOM_FOUND OR FREESCALE_FOUND OR CMAKE_BUILD_TYPE MATCHES Debug) + list(APPEND MOONLIGHT_DEFINITIONS HAVE_EMBEDDED) +endif() + list(APPEND SRC_LIST ./src/audio/alsa.c) add_subdirectory(libgamestream) diff --git a/README.md b/README.md index af3fc3e..0a8f43b 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,13 @@ For a demo see this [video](https://www.youtube.com/watch?v=XRW6O0bSHNw). quit Quit the application or game being streamed help Show this help - Streaming options: + Global options: -config Load configuration file + -save Save configuration file + + Streaming options: + -720 Use 1280x720 resolution (default) -1080 Use 1920x1080 resolution -width Horizontal resolution (default 1280) @@ -56,10 +60,13 @@ For a demo see this [video](https://www.youtube.com/watch?v=XRW6O0bSHNw). -packetsize Specify the maximum packetsize in bytes -app Name of app to stream -nosops Don't allow GFE to modify game settings - -input Use as input. Can be used multiple times - -mapping Use as gamepad mapping configuration file (use before -input) - -audio Use as ALSA audio output device (default sysdefault) -localaudio Play audio locally + -keydir \tLoad encryption keys from directory + + I/O options: + -mapping Use as gamepad mapping configuration file (use before -input) + -input Use as input. Can be used multiple times + -audio Use as ALSA audio output device (default sysdefault) Use Ctrl+Alt+Shift+Q to exit streaming session diff --git a/src/main.c b/src/main.c index 9ce9d79..e3f2dc9 100644 --- a/src/main.c +++ b/src/main.c @@ -96,17 +96,19 @@ static void stream(PSERVER_DATA server, PCONFIGURATION config, enum platform sys } static void help() { - printf("Usage: moonlight action [options] host\n\n"); - printf(" Actions\n\n"); + printf("Usage: moonlight [action] (options) [host]\n"); + printf(" moonlight [configfile]\n"); + printf("\n Actions\n\n"); printf("\tmap\t\t\tCreate mapping file for gamepad\n"); printf("\tpair\t\t\tPair device with computer\n"); printf("\tstream\t\t\tStream computer to device\n"); printf("\tlist\t\t\tList available games and applications\n"); printf("\tquit\t\t\tQuit the application or game being streamed\n"); - printf("\thelp\t\t\tShow this help\n\n"); - printf(" Streaming options\n\n"); + printf("\thelp\t\t\tShow this help\n"); + printf("\n Global Options\n\n"); printf("\t-config \tLoad configuration file\n"); printf("\t-save \t\tSave configuration file\n"); + printf("\n Streaming options\n\n"); printf("\t-720\t\t\tUse 1280x720 resolution [default]\n"); printf("\t-1080\t\t\tUse 1920x1080 resolution\n"); printf("\t-width \t\tHorizontal resolution (default 1280)\n"); @@ -117,12 +119,15 @@ static void help() { printf("\t-packetsize \tSpecify the maximum packetsize in bytes\n"); printf("\t-app \t\tName of app to stream\n"); printf("\t-nosops\t\t\tDon't allow GFE to modify game settings\n"); - printf("\t-input \t\tUse as input. Can be used multiple times\n"); - printf("\t-mapping \t\tUse as gamepad mapping configuration file (use before -input)\n"); - printf("\t-audio \t\tUse as ALSA audio output device (default sysdefault)\n"); printf("\t-localaudio\t\tPlay audio locally\n"); - printf("\t-keydir \tLoad encryption keys from directory\n\n"); - printf("Use Ctrl+Alt+Shift+Q to exit streaming session\n\n"); + printf("\t-keydir \tLoad encryption keys from directory\n"); + #ifdef HAVE_EMBEDDED + printf("\n I/O options\n\n"); + printf("\t-mapping \t\tUse as gamepad mapping configuration file (use before -input)\n"); + printf("\t-input \t\tUse as input. Can be used multiple times\n"); + printf("\t-audio \t\tUse as ALSA audio output device (default sysdefault)\n"); + #endif + printf("\nUse Ctrl+Alt+Shift+Q to exit streaming session\n\n"); exit(0); }