X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcec-config%2Fcec-config.cpp;h=d0840cec926546a56c6e1660c82cb832279f9de1;hb=44a1d92aaca0d0428673f5479152bb1994b40f61;hp=02e812663993b86f48ebcd5ad91b5bc5414f0ee3;hpb=32403cc3b1abb8b186ca4bbe14cb7431a492f768;p=deb_libcec.git
diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index 02e8126..d0840ce 100644
--- a/src/cec-config/cec-config.cpp
+++ b/src/cec-config/cec-config.cpp
@@ -185,7 +185,7 @@ bool OpenConnection(cec_device_type type = CEC_DEVICE_TYPE_RECORDING_DEVICE)
g_config.Clear();
snprintf(g_config.strDeviceName, 13, "CEC-config");
g_config.callbackParam = NULL;
- g_config.clientVersion = CEC_CLIENT_VERSION_1_5_0;
+ g_config.clientVersion = (uint32_t)CEC_CLIENT_VERSION_1_5_0;
g_callbacks.CBCecLogMessage = &CecLogMessage;
g_callbacks.CBCecKeyPress = &CecKeyPress;
g_callbacks.CBCecCommand = &CecCommand;
@@ -381,11 +381,11 @@ int main (int UNUSED(argc), char *UNUSED(argv[]))
}
{
- PrintToStdOut("Do you want to power on CEC devices when starting the application (y/n)?");
+ PrintToStdOut("Do you want to make the CEC adapter the active source when starting the application (y/n)?");
string input;
getline(cin, input);
cin.clear();
- g_config.bPowerOnStartup = (input == "y" || input == "Y") ? 1 : 0;
+ g_config.bActivateSource = (input == "y" || input == "Y") ? 1 : 0;
}
{
@@ -393,7 +393,8 @@ int main (int UNUSED(argc), char *UNUSED(argv[]))
string input;
getline(cin, input);
cin.clear();
- g_config.bPowerOffShutdown = (input == "y" || input == "Y") ? 1 : 0;
+ if (input == "y" || input == "Y")
+ g_config.powerOffDevices.Set(CECDEVICE_BROADCAST);
}
{
@@ -417,8 +418,8 @@ int main (int UNUSED(argc), char *UNUSED(argv[]))
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("Make the adapter the active source when starting XBMC: %s", g_config.bActivateSource ? "yes" : "no");
+ PrintToStdOut("Power off devices when stopping XBMC: %s", g_config.powerOffDevices.IsSet(CECDEVICE_BROADCAST) ? "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");
@@ -451,8 +452,8 @@ int main (int UNUSED(argc), char *UNUSED(argv[]))
"\t\n" <<
"\t\n" <<
"\t\n" <<
- "\t\n" <<
- "\t\n" <<
+ "\t\n" <<
+ "\t\n" <<
"\t\n" <<
"\t\n" <<
"\t\n" <<