From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 14 Feb 2012 01:04:59 +0000 (+0100)
Subject: cec-config: always set the hdmi port number and device, or v1.4- clients won't work... 
X-Git-Tag: upstream/2.2.0~1^2~35^2~64
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ddbda099de53712c09315291d96b6d9db2ac1bbc;hp=60383b11a744aae1352f84d1a93aef163b0a17a0;p=deb_libcec.git

cec-config: always set the hdmi port number and device, or v1.4- clients won't work properly
---

diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index 3fc7af3..ceef2d9 100644
--- a/src/cec-config/cec-config.cpp
+++ b/src/cec-config/cec-config.cpp
@@ -446,8 +446,8 @@ int main (int UNUSED(argc), char *UNUSED(argv[]))
     {
       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=\"cec_hdmi_port\" value=\"" << g_config.iHDMIPort << "\" />\n" <<
+          "\t<setting id=\"connected_device\" value=\"" << (int)g_config.baseDevice << "\" />\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" <<