g_callbacks.CBCecKeyPress = &CecKeyPress;
g_callbacks.CBCecCommand = &CecCommand;
g_callbacks.CBCecConfigurationChanged = NULL;
+ g_callbacks.CBCecAlert = NULL;
adapter->EnableCallbacks(NULL, &g_callbacks);
}
if (input.empty())
return -1;
- int8_t hdmiport = atoi(input.c_str());
- if (hdmiport < 1 || hdmiport > 15)
- return -1;
-
- return hdmiport;
+ 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 <enter>. 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 <enter>. Anything else will cancel this wizard.");
string input;
getline(cin, input);