X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=3fc7af3f656ced928b4d220c8b15950e8c86c031;hb=50e2792889c9cd53093f23dcce5b56c5530245f9;hp=158848235e960e503ff8444fc55fc87b7ed24e81;hpb=224ea8772f229d2d7dafcdbf64c4266c9b4de35e;p=deb_libcec.git

diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index 1588482..3fc7af3 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;
 }
 
@@ -302,6 +298,12 @@ uint16_t FindPhysicalAddress(void)
     }
   }
 
+  if (iAddress != 0)
+  {
+    g_parser->SetPhysicalAddress(iAddress);
+    g_parser->SetActiveSource(g_config.deviceTypes[0]);
+  }
+
   return iAddress;
 }
 
@@ -320,8 +322,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();
@@ -337,7 +338,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())
@@ -438,6 +439,28 @@ int main (int argc, char *argv[])
   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 <<
+        "<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=\"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_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" <<
+          "\t<setting id=\"port\" value=\"\" />\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();