cec: fix linux compilation and warning after the recent changes
[deb_libcec.git] / src / cec-config / cec-config.cpp
index 7b69bf883d21e343183e2de0988410f425071981..a853f9169f2adda9c0ea8073052e93a694d446f4 100644 (file)
@@ -302,27 +302,32 @@ 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_responseCondtion.Wait(g_responseMutex, (uint32_t)(iTarget - iNow));
         if (g_lastCommand == CEC_OPCODE_REQUEST_ACTIVE_SOURCE)
           break;
         iNow = GetTimeMs();
@@ -338,7 +343,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())
@@ -348,10 +353,9 @@ int main (int argc, char *argv[])
     return 1;
 
   bool bAddressOk(false);
-  uint16_t iAddress(0xFFFF);
   while (!bAddressOk)
   {
-    iAddress = FindPhysicalAddress();
+    uint16_t iAddress = FindPhysicalAddress();
 
     PrintToStdOut("Physical address: %4X", iAddress);
     PrintToStdOut("Is this correct (y/n)?");
@@ -361,10 +365,108 @@ int main (int argc, char *argv[])
     bAddressOk = (input == "y" || input == "Y");
   }
 
-  PrintToStdOut("=== USB-CEC Adapter Configuration Summary ===\n");
-  bool bHasAudiosystem = g_parser->IsActiveDevice(CECDEVICE_AUDIOSYSTEM);
+  g_parser->GetCurrentConfiguration(&g_config);
+
+  {
+    cec_menu_language lang;
+    if (g_parser->GetDeviceMenuLanguage(CECDEVICE_TV, &lang))
+    {
+      PrintToStdOut("TV menu language: %s", lang.language);
+      PrintToStdOut("Do you want the application to use the menu language of the TV (y/n)?");
+      string input;
+      getline(cin, input);
+      cin.clear();
+      g_config.bUseTVMenuLanguage = (input == "y" || input == "Y") ? 1 : 0;
+    }
+    else
+    {
+      PrintToStdOut("The TV did not respond properly to the menu language request.");
+    }
+  }
+
+  {
+    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;
+  }
+
+  {
+    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;
+  }
+
+  {
+    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;
+  }
 
-  PrintToStdOut("Physical address: %4X", iAddress);
+  {
+    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");
+  }
+
+  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.");
+
+    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();
   g_parser->Close();