X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=2897e2dddb740fc7f2bb6ceba00e5224510b97b5;hb=5d5e105deb964d38568f046d1d1f0a4a656e1a99;hp=c36bb6a1a854ec3b12d274b1adfe65fcc5feb695;hpb=f57cba645f0f22c109355ef55c78cf328adc2d93;p=deb_libcec.git diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp index c36bb6a..2897e2d 100644 --- a/src/cec-config/cec-config.cpp +++ b/src/cec-config/cec-config.cpp @@ -59,6 +59,7 @@ CCondition g_keyCondtion; cec_user_control_code g_lastKey = CEC_USER_CONTROL_CODE_UNKNOWN; ICECCallbacks g_callbacks; +libcec_configuration g_config; ICECAdapter * g_parser; cec_logical_address g_primaryAddress; @@ -184,11 +185,18 @@ bool ProcessConsoleCommand(string &input) bool OpenConnection(cec_device_type type = CEC_DEVICE_TYPE_RECORDING_DEVICE) { - cec_device_type_list types; - types.clear(); - types.add(type); + g_config.Clear(); + snprintf(g_config.strDeviceName, 13, "CEC-config"); + g_config.callbackParam = NULL; + g_config.clientVersion = CEC_CLIENT_VERSION_1_5_0; + g_callbacks.CBCecLogMessage = &CecLogMessage; + g_callbacks.CBCecKeyPress = &CecKeyPress; + g_callbacks.CBCecCommand = &CecCommand; + g_config.callbacks = &g_callbacks; + + g_config.deviceTypes.add(type); - g_parser = CreateParser(types); + g_parser = LibCecInitialise(&g_config); if (!g_parser) return false; @@ -206,12 +214,7 @@ bool OpenConnection(cec_device_type type = CEC_DEVICE_TYPE_RECORDING_DEVICE) strPort = devices[0].comm; } - EnableCallbacks(g_parser); - - // start with HDMI1 on the TV - g_parser->SetHDMIPort(CECDEVICE_TV, 1); PrintToStdOut("opening a connection to the CEC adapter..."); - if (!g_parser->Open(strPort.c_str())) { PrintToStdOut("unable to open the device on port %s", strPort.c_str()); @@ -299,27 +302,32 @@ uint16_t FindPhysicalAddress(void) } } + if (iAddress != 0) + { + g_parser->SetPhysicalAddress(iAddress); + g_parser->SetActiveSource(g_config.deviceTypes[0]); + } + return iAddress; } -bool PowerOnTV(uint64_t iTimeout = 60000, unsigned iTries = 2) +bool PowerOnTV(uint64_t iTimeout = 60000) { cec_power_status currentTvPower(CEC_POWER_STATUS_UNKNOWN); uint64_t iNow = GetTimeMs(); uint64_t iTarget = iNow + iTimeout; - unsigned iTry(0); - while (currentTvPower != CEC_POWER_STATUS_ON && iTarget > iNow && iTry < iTries) + if (currentTvPower != CEC_POWER_STATUS_ON) { currentTvPower = g_parser->GetDevicePowerStatus(CECDEVICE_TV); if (currentTvPower != CEC_POWER_STATUS_ON) { - PrintToStdOut("Sending 'power on' command to the TV"); + PrintToStdOut("Sending 'power on' command to the TV\n=== Please wait ==="); g_parser->PowerOnDevices(CECDEVICE_TV); while (iTarget > iNow) { CLockObject lock(g_responseMutex); - g_responseCondtion.Wait(g_responseMutex, (uint32_t)((iTarget - iNow)/iTries)); + g_responseCondtion.Wait(g_responseMutex, (uint32_t)(iTarget - iNow)); if (g_lastCommand == CEC_OPCODE_REQUEST_ACTIVE_SOURCE) break; iNow = GetTimeMs(); @@ -345,10 +353,9 @@ int main (int argc, char *argv[]) return 1; bool bAddressOk(false); - uint16_t iAddress(0xFFF); while (!bAddressOk) { - iAddress = FindPhysicalAddress(); + uint16_t iAddress = FindPhysicalAddress(); PrintToStdOut("Physical address: %4X", iAddress); PrintToStdOut("Is this correct (y/n)?"); @@ -358,8 +365,108 @@ int main (int argc, char *argv[]) bAddressOk = (input == "y" || input == "Y"); } - PrintToStdOut("=== USB-CEC Adapter Configuration Summary ===\n"); - PrintToStdOut("Physical address: %4X", iAddress); + g_parser->GetCurrentConfiguration(&g_config); + + { + cec_menu_language lang; + if (g_parser->GetDeviceMenuLanguage(CECDEVICE_TV, &lang)) + { + PrintToStdOut("TV menu language: %s", lang.language); + PrintToStdOut("Do you want the application to use the menu language of the TV (y/n)?"); + string input; + getline(cin, input); + cin.clear(); + g_config.bUseTVMenuLanguage = (input == "y" || input == "Y") ? 1 : 0; + } + else + { + PrintToStdOut("The TV did not respond properly to the menu language request."); + } + } + + { + PrintToStdOut("Do you want to power on CEC devices when starting the application (y/n)?"); + string input; + getline(cin, input); + cin.clear(); + g_config.bPowerOnStartup = (input == "y" || input == "Y") ? 1 : 0; + } + + { + PrintToStdOut("Do you want to power off CEC devices when closing the application (y/n)?"); + string input; + getline(cin, input); + cin.clear(); + g_config.bPowerOffShutdown = (input == "y" || input == "Y") ? 1 : 0; + } + + { + PrintToStdOut("Do you want to power off CEC devices when the screensaver is activated (y/n)?"); + string input; + getline(cin, input); + cin.clear(); + g_config.bPowerOffScreensaver = (input == "y" || input == "Y") ? 1 : 0; + } + + { + PrintToStdOut("Do you want to put the PC in standby when the TV is put in standby mode (y/n)?"); + string input; + getline(cin, input); + cin.clear(); + g_config.bPowerOffOnStandby = (input == "y" || input == "Y"); + } + + PrintToStdOut("\n\n=== USB-CEC Adapter Configuration Summary ==="); + PrintToStdOut("HDMI port number: %d", g_config.iHDMIPort); + 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("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"); + + if (g_parser->CanPersistConfiguration()) + { + PrintToStdOut("Do you want to store these settings in the adapter (y/n)?"); + string input; + getline(cin, input); + cin.clear(); + if (input == "y" || input == "Y") + { + PrintToStdOut("Storing settings ..."); + if (g_parser->PersistConfiguration(&g_config)) + PrintToStdOut("Settings stored."); + else + PrintToStdOut("The settings could not be stored"); + } + } + else + { + PrintToStdOut("This adapter doesn't support settings persistence. Please set up these settings in your media player application."); + + ofstream configOutput; + configOutput.open("usb_2548_1001.xml"); + if (configOutput.is_open()) + { + configOutput << + "\n" << + "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << + "\t\n" << + ""; + configOutput.close(); + + PrintToStdOut("The configuration has been stored in 'usb_2548_1001.xml'. Copy this file to ~/.userdata/peripheral_data to use it in XBMC"); + } + } g_parser->StandbyDevices(); g_parser->Close();