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;
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;
}
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);
}
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;
int8_t FindPhysicalAddressPortNumber(void)
{
- PrintToStdOut("Enter the HDMI port number to which you connected your CEC adapter, followed by <enter>. 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 <enter>. 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 <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);
}
}
+ 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_responseEvent.Wait((uint32_t)(iTarget - iNow));
if (g_lastCommand == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
break;
iNow = GetTimeMs();
return currentTvPower == CEC_POWER_STATUS_ON;
}
-int main (int argc, char *argv[])
+int main (int UNUSED(argc), char *UNUSED(argv[]))
{
PrintToStdOut("=== USB-CEC Adapter Configuration ===\n");
if (!OpenConnection())
return 1;
bool bAddressOk(false);
- uint16_t iAddress(0xFFFF);
while (!bAddressOk)
{
- iAddress = FindPhysicalAddress();
+ uint16_t iAddress = FindPhysicalAddress();
PrintToStdOut("Physical address: %4X", iAddress);
PrintToStdOut("Is this correct (y/n)?");
bAddressOk = (input == "y" || input == "Y");
}
- PrintToStdOut("=== USB-CEC Adapter Configuration Summary ===\n");
- bool bHasAudiosystem = g_parser->IsActiveDevice(CECDEVICE_AUDIOSYSTEM);
+ g_parser->GetCurrentConfiguration(&g_config);
- PrintToStdOut("Physical address: %4X", iAddress);
+ {
+ 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 make the CEC adapter the active source when starting the application (y/n)?");
+ string input;
+ getline(cin, input);
+ cin.clear();
+ g_config.bActivateSource = (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();
+ if (input == "y" || input == "Y")
+ g_config.powerOffDevices.Set(CECDEVICE_BROADCAST);
+ }
+
+ {
+ 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") ? 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 ===");
+ 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("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", 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())
+ {
+ 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())
+ {
+ 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 <<
+ "<settings>\n" <<
+ "\t<setting id=\"enabled\" value=\"1\" />\n" <<
+ "\t<setting id=\"activate_source\" value=\"" << (int)g_config.bActivateSource << "\" />\n" <<
+ "\t<setting id=\"wake_devices\" value=\"" << strWakeDevices.c_str() << "\" />\n" <<
+ "\t<setting id=\"standby_devices\" value=\"" << strStandbyDevices.c_str() << "\" />\n" <<
+ "\t<setting id=\"cec_standby_screensaver\" value=\"" << (int)g_config.bPowerOffScreensaver << "\" />\n" <<
+ "\t<setting id=\"standby_pc_on_tv_standby\" value=\"" << (int)g_config.bPowerOffOnStandby << "\" />\n" <<
+ "\t<setting id=\"use_tv_menu_language\" value=\"" << (int)g_config.bUseTVMenuLanguage << "\" />\n" <<
+ "\t<setting id=\"physical_address\" value=\"" << hex << g_config.iPhysicalAddress << "\" />\n" <<
+ "\t<setting id=\"cec_hdmi_port\" value=\"" << g_config.iHDMIPort << "\" />\n" <<
+ "\t<setting id=\"connected_device\" value=\"" << (int)g_config.baseDevice << "\" />\n" <<
+ "\t<setting id=\"port\" value=\"\" />\n" <<
+ "\t<setting id=\"send_inactive_source\" value=\"" << (int)g_config.bSendInactiveSource << "\" />\n" <<
+ "</settings>";
+ 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();
repositories / deb_libcec.git / blobdiff