morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

clean up -s (display size) code

Browse Source
This commit is contained in:
fduncanh
2021-08-02 04:01:07 -04:00
parent 622398d901
commit 8829e458d7
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
uxplay.cpp
View File

@@ -33,7 +33,7 @@
#include "renderers/video_renderer.h" #include "renderers/video_renderer.h"
#include "renderers/audio_renderer.h" #include "renderers/audio_renderer.h"
#define VERSION "1.2" #define VERSION "1.3"
#define DEFAULT_NAME "UxPlay" #define DEFAULT_NAME "UxPlay"
#define DEFAULT_DEBUG_LOG false #define DEFAULT_DEBUG_LOG false
@@ -124,14 +124,14 @@ void print_info(char *name) {
printf("-s wxh Set display size: width w height h default 1920x1080\n"); printf("-s wxh Set display size: width w height h default 1920x1080\n");
printf("-p n Use fixed UDP+TCP network ports n:n+1:n+2 > 1023\n"); printf("-p n Use fixed UDP+TCP network ports n:n+1:n+2 > 1023\n");
printf("-p Use legacy UDP 6000:6001:7011 TCP 7000:7001:7100\n"); printf("-p Use legacy UDP 6000:6001:7011 TCP 7000:7001:7100\n");
printf("-r use random MAC address (use for concurrent UxPlay's\n"); printf("-r use random MAC address (use for concurrent UxPlay's)\n");
printf("-a Turn audio off. Only video output\n"); printf("-a Turn audio off. Only video output\n");
printf("-d Enable debug logging\n"); printf("-d Enable debug logging\n");
printf("-v/-h Displays this help and version information\n"); printf("-v/-h Displays this help and version information\n");
} }
bool get_display_size(char *str, unsigned short *w, unsigned short *h) { bool get_display_size(char *str, unsigned short *w, unsigned short *h) {
// assume str = wxh or wXh is valid if w and h are positive decimal integers with less than 5 digits. // assume str = wxh or wXh is valid if w and h are positive decimal integers with less than 5 digits.
char *str1 = str; char *str1 = str;
for (int i = 0; i < strlen(str); i++) { for (int i = 0; i < strlen(str); i++) {
str1++; str1++;
@@ -139,15 +139,14 @@ bool get_display_size(char *str, unsigned short *w, unsigned short *h) {
str[i] = '\0'; str[i] = '\0';
} }
} }
bool valid_size = (strlen(str) < 5 && strlen(str1) < 5 && strlen(str) && strlen(str1) ); if (str1[0] == '-') return false;
if(valid_size) { if (strlen(str) > 5 || strlen(str1) > 5 || !strlen(str) || !strlen(str1)) return false;
char *end; char *end;
*w = (unsigned short) strtoul(str, &end, 10); *w = (unsigned short) strtoul(str, &end, 10);
if(*end || *w == 0) valid_size = false; if(*end || *w == 0) return false;
*h = (unsigned short) strtoul(str1, &end, 10); *h = (unsigned short) strtoul(str1, &end, 10);
if(*end || *h == 0) valid_size = false; if(*end || *h == 0) return false;
} return true;
return valid_size;
} }
bool get_lowest_port(char *str, unsigned short *n) { bool get_lowest_port(char *str, unsigned short *n) {
@@ -185,11 +184,11 @@ int main(int argc, char *argv[]) {
server_name = std::string(argv[++i]); server_name = std::string(argv[++i]);
} else if (arg == "-s") { } else if (arg == "-s") {
if (i == argc - 1 || argv[i + 1][0] == '-') { if (i == argc - 1 || argv[i + 1][0] == '-') {
LOGI("%s missing argument, skipping\n", argv[i]); fprintf(stderr,"invalid \"-s\" had no argument\n");
continue; exit(1);
} }
std::string value(argv[++i]); std::string value(argv[++i]);
if (!get_display_size(argv[i], &display_size[1], &display_size[2])) { if (!get_display_size(argv[i], &display_size[0], &display_size[1])) {
fprintf(stderr, "invalid \"-s %s\"; default is \"-s 1920x1080\" (< 5 digits)\n", fprintf(stderr, "invalid \"-s %s\"; default is \"-s 1920x1080\" (< 5 digits)\n",
value.c_str()); value.c_str());
exit(1); exit(1);
@@ -235,13 +234,12 @@ int main(int argc, char *argv[]) {
mac_address = random_mac(); mac_address = random_mac();
LOGI("using randomly-generated MAC address %s\n",mac_address.c_str()); LOGI("using randomly-generated MAC address %s\n",mac_address.c_str());
} }
parse_hw_addr(mac_address, server_hw_addr); parse_hw_addr(mac_address, server_hw_addr);
if (start_server(server_hw_addr, server_name, display_size, tcp, udp, use_audio, debug_log) != 0) { if (start_server(server_hw_addr, server_name, display_size, tcp, udp, use_audio, debug_log) != 0) {
return 1; return 1;
} }
running = true; running = true;
while (running) { while (running) {
sleep(1); sleep(1);