cec: set the ackmask to 0 when closing the connection

diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index 158848235e960e503ff8444fc55fc87b7ed24e81..5d1454794c333db7ac242fe4e37608abbb4d6d4e 100644 (file)
--- a/src/cec-config/cec-config.cpp
+++ b/src/cec-config/cec-config.cpp
@@ -305,23 +305,24 @@ uint16_t FindPhysicalAddress(void)
   return iAddress;
 }
 
-bool PowerOnTV(uint64_t iTimeout = 60000)
+bool PowerOnTV(uint64_t iTimeout = 60000, unsigned iTries = 2)
 {
   cec_power_status currentTvPower(CEC_POWER_STATUS_UNKNOWN);
   uint64_t iNow = GetTimeMs();
   uint64_t iTarget = iNow + iTimeout;
+  unsigned iTry(0);
 
-  if (currentTvPower != CEC_POWER_STATUS_ON)
+  while (currentTvPower != CEC_POWER_STATUS_ON && iTarget > iNow && iTry < iTries)
   {
     currentTvPower = g_parser->GetDevicePowerStatus(CECDEVICE_TV);
     if (currentTvPower != CEC_POWER_STATUS_ON)
     {
-      PrintToStdOut("Sending 'power on' command to the TV\n=== Please wait ===");
+      PrintToStdOut("Sending 'power on' command to the TV");
       g_parser->PowerOnDevices(CECDEVICE_TV);
       while (iTarget > iNow)
       {
         CLockObject lock(g_responseMutex);
-        g_responseCondtion.Wait(g_responseMutex, (uint32_t)(iTarget - iNow));
+        g_responseCondtion.Wait(g_responseMutex, (uint32_t)((iTarget - iNow)/iTries));
         if (g_lastCommand == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
           break;
         iNow = GetTimeMs();
@@ -361,6 +362,7 @@ 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))
@@ -370,7 +372,7 @@ int main (int argc, char *argv[])
       string input;
       getline(cin, input);
       cin.clear();
-      g_config.bUseTVMenuLanguage = (input == "y" || input == "Y") ? 1 : 0;
+      bUseTVMenuLanguage = (input == "y" || input == "Y");
     }
     else
     {
@@ -378,67 +380,50 @@ int main (int argc, char *argv[])
     }
   }
 
+  bool bPowerOnStartup(false);
   {
     PrintToStdOut("Do you want to power on CEC devices when starting the application (y/n)?");
     string input;
     getline(cin, input);
     cin.clear();
-    g_config.bPowerOnStartup = (input == "y" || input == "Y") ? 1 : 0;
+    bPowerOnStartup = (input == "y" || input == "Y");
   }
 
+  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();
-    g_config.bPowerOffShutdown = (input == "y" || input == "Y") ? 1 : 0;
+    bPowerOffShutdown = (input == "y" || input == "Y");
   }
 
+  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();
-    g_config.bPowerOffScreensaver = (input == "y" || input == "Y") ? 1 : 0;
+    bPowerOffScreensaver = (input == "y" || input == "Y");
   }
 
+  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();
-    g_config.bPowerOffOnStandby = (input == "y" || input == "Y");
+    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", 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("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.");
-  }
+  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");
 
   g_parser->StandbyDevices();
   g_parser->Close();

diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp
index 924c65a8b0a872ac29cdebc106e5b88f42f08817..62c988b93a93126b1d6d14628101c9d6d3b8a948 100644 (file)
--- a/src/lib/adapter/USBCECAdapterCommunication.cpp
+++ b/src/lib/adapter/USBCECAdapterCommunication.cpp
@@ -172,6 +172,7 @@ bool CUSBCECAdapterCommunication::Open(IAdapterCommunicationCallback *cb, uint32
 
 void CUSBCECAdapterCommunication::Close(void)
 {
+  SetAckMask(0);
   CLockObject lock(m_mutex);
   m_rcvCondition.Broadcast();
   StopThread();