X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=1e6c96fd9272e6763b7fd265294019710f433202;hb=a75e3a5a63546d6f7e670bc2a7a1931887a5d2a0;hp=a853f9169f2adda9c0ea8073052e93a694d446f4;hpb=39b1216c4883c7a3a351283e61e58891699ef091;p=deb_libcec.git diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp index a853f91..1e6c96f 100644 --- a/src/cec-config/cec-config.cpp +++ b/src/cec-config/cec-config.cpp @@ -50,12 +50,10 @@ using namespace PLATFORM; CMutex g_outputMutex; -CMutex g_responseMutex; -CCondition g_responseCondtion; +CEvent g_responseEvent; cec_opcode g_lastCommand = CEC_OPCODE_NONE; -CMutex g_keyMutex; -CCondition g_keyCondtion; +CEvent g_keyEvent; cec_user_control_code g_lastKey = CEC_USER_CONTROL_CODE_UNKNOWN; ICECCallbacks g_callbacks; @@ -129,17 +127,15 @@ int CecLogMessage(void *UNUSED(cbParam), const cec_log_message &message) int CecKeyPress(void *UNUSED(cbParam), const cec_keypress &key) { - CLockObject lock(g_keyMutex); g_lastKey = key.keycode; - g_keyCondtion.Signal(); + g_keyEvent.Signal(); return 0; } int CecCommand(void *UNUSED(cbParam), const cec_command &command) { - CLockObject lock(g_responseMutex); g_lastCommand = command.opcode; - g_responseCondtion.Signal(); + g_responseEvent.Signal(); return 0; } @@ -148,6 +144,8 @@ void EnableCallbacks(ICECAdapter *adapter) g_callbacks.CBCecLogMessage = &CecLogMessage; g_callbacks.CBCecKeyPress = &CecKeyPress; g_callbacks.CBCecCommand = &CecCommand; + g_callbacks.CBCecConfigurationChanged = NULL; + g_callbacks.CBCecAlert = NULL; adapter->EnableCallbacks(NULL, &g_callbacks); } @@ -188,7 +186,7 @@ bool OpenConnection(cec_device_type type = CEC_DEVICE_TYPE_RECORDING_DEVICE) g_config.Clear(); snprintf(g_config.strDeviceName, 13, "CEC-config"); g_config.callbackParam = NULL; - g_config.clientVersion = CEC_CLIENT_VERSION_1_5_0; + g_config.clientVersion = (uint32_t)CEC_CLIENT_VERSION_1_5_0; g_callbacks.CBCecLogMessage = &CecLogMessage; g_callbacks.CBCecKeyPress = &CecKeyPress; g_callbacks.CBCecCommand = &CecCommand; @@ -231,18 +229,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); @@ -326,8 +326,7 @@ bool PowerOnTV(uint64_t iTimeout = 60000) g_parser->PowerOnDevices(CECDEVICE_TV); while (iTarget > iNow) { - CLockObject lock(g_responseMutex); - g_responseCondtion.Wait(g_responseMutex, (uint32_t)(iTarget - iNow)); + g_responseEvent.Wait((uint32_t)(iTarget - iNow)); if (g_lastCommand == CEC_OPCODE_REQUEST_ACTIVE_SOURCE) break; iNow = GetTimeMs(); @@ -385,11 +384,11 @@ int main (int UNUSED(argc), char *UNUSED(argv[])) } { - PrintToStdOut("Do you want to power on CEC devices when starting the application (y/n)?"); + PrintToStdOut("Do you want to make the CEC adapter the active source when starting the application (y/n)?"); string input; getline(cin, input); cin.clear(); - g_config.bPowerOnStartup = (input == "y" || input == "Y") ? 1 : 0; + g_config.bActivateSource = (input == "y" || input == "Y") ? 1 : 0; } { @@ -397,7 +396,8 @@ int main (int UNUSED(argc), char *UNUSED(argv[])) string input; getline(cin, input); cin.clear(); - g_config.bPowerOffShutdown = (input == "y" || input == "Y") ? 1 : 0; + if (input == "y" || input == "Y") + g_config.powerOffDevices.Set(CECDEVICE_BROADCAST); } { @@ -413,7 +413,15 @@ int main (int UNUSED(argc), char *UNUSED(argv[])) string input; getline(cin, input); cin.clear(); - g_config.bPowerOffOnStandby = (input == "y" || input == "Y"); + g_config.bPowerOffOnStandby = (input == "y" || input == "Y") ? 1 : 0; + } + + { + PrintToStdOut("Do you want to send an inactive source message when stopping the application (y/n)?"); + string input; + getline(cin, input); + cin.clear(); + g_config.bSendInactiveSource = (input == "y" || input == "Y") ? 1 : 0; } PrintToStdOut("\n\n=== USB-CEC Adapter Configuration Summary ==="); @@ -421,10 +429,11 @@ int main (int UNUSED(argc), char *UNUSED(argv[])) PrintToStdOut("Connected to HDMI device: %X", (uint8_t)g_config.baseDevice); PrintToStdOut("Physical address: %4X", g_config.iPhysicalAddress); PrintToStdOut("Use the TV's language setting: %s", g_config.bUseTVMenuLanguage ? "yes" : "no"); - PrintToStdOut("Power on the TV when starting XBMC: %s", g_config.bPowerOnStartup ? "yes" : "no"); - PrintToStdOut("Power off devices when stopping XBMC: %s", g_config.bPowerOffShutdown ? "yes" : "no"); + PrintToStdOut("Make the adapter the active source when starting XBMC: %s", g_config.bActivateSource ? "yes" : "no"); + PrintToStdOut("Power off devices when stopping XBMC: %s", g_config.powerOffDevices.IsSet(CECDEVICE_BROADCAST) ? "yes" : "no"); PrintToStdOut("Put devices in standby mode when activating screensaver: %s", g_config.bPowerOffScreensaver ? "yes" : "no"); - PrintToStdOut("Put this PC in standby mode when the TV is switched off: %s\n\n", g_config.bPowerOffOnStandby ? "yes" : "no"); + PrintToStdOut("Put this PC in standby mode when the TV is switched off: %s", g_config.bPowerOffOnStandby ? "yes" : "no"); + PrintToStdOut("Seend an inactive source message when stopping XBMC: %s\n\n", g_config.bSendInactiveSource ? "yes" : "no"); if (g_parser->CanPersistConfiguration()) { @@ -449,18 +458,29 @@ int main (int UNUSED(argc), char *UNUSED(argv[])) configOutput.open("usb_2548_1001.xml"); if (configOutput.is_open()) { + CStdString strWakeDevices; + for (uint8_t iPtr = 0; iPtr < 16; iPtr++) + if (g_config.wakeDevices[iPtr]) + strWakeDevices.AppendFormat(" %d" + iPtr); + CStdString strStandbyDevices; + for (uint8_t iPtr = 0; iPtr < 16; iPtr++) + if (g_config.powerOffDevices[iPtr]) + strStandbyDevices.AppendFormat(" %d" + iPtr); + configOutput << "\n" << - "\t\n" << - "\t\n" << - "\t\n" << - "\t\n" << - "\t\n" << - "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << "\t\n" << "\t\n" << - "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << "\t\n" << + "\t\n" << ""; configOutput.close();