X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=b5ecd8e7235b643c7669fa10793c51e455595974;hb=ca27e6cf80cc7750e82f7cef6cb671a63b94db74;hp=2897e2dddb740fc7f2bb6ceba00e5224510b97b5;hpb=1361efd225b70e80a404c66047baf38a9db54e86;p=deb_libcec.git

diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index 2897e2d..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);
 }
 
@@ -326,8 +323,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();
@@ -343,7 +339,7 @@ bool PowerOnTV(uint64_t iTimeout = 60000)
   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())
@@ -385,11 +381,11 @@ int main (int argc, char *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 +393,8 @@ int main (int argc, char *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);
   }
 
   {
@@ -421,8 +418,8 @@ int main (int argc, char *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");
 
@@ -451,12 +448,12 @@ int main (int argc, char *argv[])
     {
       configOutput <<
         "<settings>\n" <<
-          "\t<setting id=\"cec_hdmi_port\" value=\"" << (g_config.iPhysicalAddress == 0 ? g_config.iHDMIPort : 0) << "\" />\n" <<
-          "\t<setting id=\"connected_device\" value=\"" << (g_config.iPhysicalAddress == 0 ? (int)g_config.baseDevice : 0) << "\" />\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=\"physical_address\" value=\"" << hex << g_config.iPhysicalAddress << "\" />\n" <<
           "\t<setting id=\"use_tv_menu_language\" value=\"" << (int)g_config.bUseTVMenuLanguage << "\" />\n" <<
-          "\t<setting id=\"cec_power_on_startup\" value=\"" << (int)g_config.bPowerOnStartup << "\" />\n" <<
-          "\t<setting id=\"cec_power_off_shutdown\" value=\"" << (int)g_config.bPowerOffShutdown << "\" />\n" <<
+          "\t<setting id=\"cec_power_on_startup\" value=\"" << (int)g_config.bActivateSource << "\" />\n" <<
+          "\t<setting id=\"cec_power_off_shutdown\" value=\"" << (int)(g_config.powerOffDevices.IsSet(CECDEVICE_BROADCAST) ? 1 : 0) << "\" />\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=\"enabled\" value=\"1\" />\n" <<