cec: added a callback that is called when libCEC's configuration changed.

[deb_libcec.git] / src / cec-config / cec-config.cpp

diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index a853f9169f2adda9c0ea8073052e93a694d446f4..02e812663993b86f48ebcd5ad91b5bc5414f0ee3 100644 (file)
--- 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();
@@ -451,8 +447,8 @@ int main (int UNUSED(argc), char *UNUSED(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" <<