X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=5d1454794c333db7ac242fe4e37608abbb4d6d4e;hb=b0a7410c263717618b20fe4be5d3732105c5af97;hp=7b69bf883d21e343183e2de0988410f425071981;hpb=c7dc6e28e6a7dbbb685b4788fd77774e34196717;p=deb_libcec.git

diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index 7b69bf8..5d14547 100644
--- a/src/cec-config/cec-config.cpp
+++ b/src/cec-config/cec-config.cpp
@@ -348,10 +348,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 +360,70 @@ 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);
+
+  bool bUseTVMenuLanguage(false);
+  {
+    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();
+      bUseTVMenuLanguage = (input == "y" || input == "Y");
+    }
+    else
+    {
+      PrintToStdOut("The TV did not respond properly to the menu language request.");
+    }
+  }
+
+  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();
+    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();
+    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();
+    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();
+    bPowerOffOnStandby = (input == "y" || input == "Y");
+  }
 
-  PrintToStdOut("Physical address: %4X", iAddress);
+  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", 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();