X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=a7335c74a94ccd14bb8f6b75c5233ed9b344d6e3;hb=21d8397898e90f5f90be4b0c7d42922289e8ea25;hp=456369180c069a9a66122ef720314cf38249cab5;hpb=f99b4d1a21d99436a3e49733e7b83276a6362cbf;p=deb_libcec.git diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp index 4563691..a7335c7 100644 --- a/src/cec-config/cec-config.cpp +++ b/src/cec-config/cec-config.cpp @@ -228,18 +228,20 @@ bool OpenConnection(cec_device_type type = CEC_DEVICE_TYPE_RECORDING_DEVICE) int8_t FindPhysicalAddressPortNumber(void) { - PrintToStdOut("Enter the HDMI port number to which you connected your CEC adapter, followed by . Only port 1, 2, 3 or 4 are supported. Anything else will cancel this wizard."); + PrintToStdOut("Enter the HDMI port number to which you connected your CEC adapter, followed by . Valid ports are in the range 1-15. Anything else will cancel this wizard."); string input; getline(cin, input); cin.clear(); - if (input.empty() || (input != "1" && input != "2" && input != "3" && input != "4")) + if (input.empty()) return -1; - return (int8_t)atoi(input.c_str()); + + int hdmiport = atoi(input.c_str()); + return (hdmiport < 1 || hdmiport > 15) ? -1 : (int8_t)hdmiport; } cec_logical_address FindPhysicalAddressBaseDevice(void) { - PrintToStdOut("Press 1 of your CEC adapter is connected to your TV or\npress 2 if it's connected to an AVR, followed by . Anything else will cancel this wizard."); + PrintToStdOut("Press 1 if your CEC adapter is connected to your TV or\npress 2 if it's connected to an AVR, followed by . Anything else will cancel this wizard."); string input; getline(cin, input);