X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=b5ecd8e7235b643c7669fa10793c51e455595974;hb=ca27e6cf80cc7750e82f7cef6cb671a63b94db74;hp=5d1454794c333db7ac242fe4e37608abbb4d6d4e;hpb=b0a7410c263717618b20fe4be5d3732105c5af97;p=deb_libcec.git diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp index 5d14547..b5ecd8e 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,7 @@ void EnableCallbacks(ICECAdapter *adapter) g_callbacks.CBCecLogMessage = &CecLogMessage; g_callbacks.CBCecKeyPress = &CecKeyPress; g_callbacks.CBCecCommand = &CecCommand; + g_callbacks.CBCecConfigurationChanged = NULL; adapter->EnableCallbacks(NULL, &g_callbacks); } @@ -302,27 +299,31 @@ 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_responseEvent.Wait((uint32_t)(iTarget - iNow)); if (g_lastCommand == CEC_OPCODE_REQUEST_ACTIVE_SOURCE) break; iNow = GetTimeMs(); @@ -338,7 +339,7 @@ bool PowerOnTV(uint64_t iTimeout = 60000, unsigned iTries = 2) 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()) @@ -362,7 +363,6 @@ int main (int argc, char *argv[]) g_parser->GetCurrentConfiguration(&g_config); - bool bUseTVMenuLanguage(false); { cec_menu_language lang; if (g_parser->GetDeviceMenuLanguage(CECDEVICE_TV, &lang)) @@ -372,7 +372,7 @@ int main (int argc, char *argv[]) string input; getline(cin, input); cin.clear(); - bUseTVMenuLanguage = (input == "y" || input == "Y"); + g_config.bUseTVMenuLanguage = (input == "y" || input == "Y") ? 1 : 0; } else { @@ -380,50 +380,90 @@ int main (int argc, char *argv[]) } } - bool bPowerOnStartup(false); { - 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(); - bPowerOnStartup = (input == "y" || input == "Y"); + g_config.bActivateSource = (input == "y" || input == "Y") ? 1 : 0; } - bool bPowerOffShutdown(false); { PrintToStdOut("Do you want to power off CEC devices when closing the application (y/n)?"); string input; getline(cin, input); cin.clear(); - bPowerOffShutdown = (input == "y" || input == "Y"); + if (input == "y" || input == "Y") + g_config.powerOffDevices.Set(CECDEVICE_BROADCAST); } - bool bPowerOffScreensaver(false); { PrintToStdOut("Do you want to power off CEC devices when the screensaver is activated (y/n)?"); string input; getline(cin, input); cin.clear(); - bPowerOffScreensaver = (input == "y" || input == "Y"); + g_config.bPowerOffScreensaver = (input == "y" || input == "Y") ? 1 : 0; } - bool bPowerOffOnStandby(false); { 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(); - bPowerOffOnStandby = (input == "y" || input == "Y"); + 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", bUseTVMenuLanguage ? "yes" : "no"); - PrintToStdOut("Power on the TV when starting XBMC: %s", bPowerOnStartup ? "yes" : "no"); - PrintToStdOut("Put devices in standby mode when activating screensaver: %s", bPowerOffScreensaver ? "yes" : "no"); - PrintToStdOut("Put this PC in standby mode when the TV is switched off: %s", bPowerOffOnStandby ? "yes" : "no"); + 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\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();