cec: bump version numbers to 1.5, to prepare for the new release

diff --git a/configure.ac b/configure.ac
index b40687a4c6598be45966fd309b726a979599f442..b7a4b6006d6ecc809c882e9caf27135eb9ca349c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libcec], 1:4:0)
+AC_INIT([libcec], 1:5:0)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AC_PROG_CXX

diff --git a/include/cec.h b/include/cec.h
index a3a674e4bad62d1ffe246b57b536818f99d172d3..4a6ad989e7ef84042c2d47928cffda86e1b77124 100644 (file)
--- a/include/cec.h
+++ b/include/cec.h
@@ -419,6 +419,11 @@ namespace CEC
      * @brief Tell libCEC to poll for active devices on the bus.
      */
     virtual void RescanActiveDevices(void) = 0;
+
+    /*!
+     * @return true when libCEC is the active source on the bus, false otherwise.
+     */
+    virtual bool IsLibCECActiveSource(void) = 0;
   };
 };
 

diff --git a/include/cecc.h b/include/cecc.h
index 22fb9a3a1ee5d10968c88c2681d85ad686f0a98b..7e3512f011edb340fe7fbfef48380d2dc6b9a800 100644 (file)
--- a/include/cecc.h
+++ b/include/cecc.h
@@ -294,6 +294,8 @@ extern DECLSPEC int cec_set_configuration(const libcec_configuration *configurat
 
 extern DECLSPEC void cec_rescan_devices(void);
 
+extern DECLSPEC int cec_is_libcec_active_source(void);
+
 #ifdef __cplusplus
 };
 #endif

diff --git a/include/cectypes.h b/include/cectypes.h
index 960f6a04fc602e0b7b491c65450beb454c9f6019..5f25b9437e2f58d9b3c087a4d00f7376a8fd9cb4 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -966,7 +966,7 @@ typedef struct libcec_configuration
   cec_logical_addresses wakeDevices;          /*!< wake these CEC devices when initialising libCEC or when calling PowerOnDevices() without any parameter */
   cec_logical_addresses powerOffDevices;      /*!< power off these devices when calling StandbyDevices() without any parameter */
 
-  uint32_t              serverVersion;         /*!< the version number of the server. read-only */
+  uint32_t              serverVersion;        /*!< the version number of the server. read-only */
 
   // player specific settings
   uint8_t               bGetSettingsFromROM;  /*!< true to get the settings from the ROM (if set, and a v2 ROM is present), false to use these settings. */

diff --git a/project/cec-config.rc b/project/cec-config.rc
index 37783a24eb812f097bcfeda768938560fa6216f5..07a63248875c3c6fca4c41ca481af8df236331e8 100644 (file)
Binary files a/project/cec-config.rc and b/project/cec-config.rc differ

diff --git a/project/libCEC.nsi b/project/libCEC.nsi
index 18038099f0cb82a88209767182c7dfe08031ab55..bff402d882ca277d9e7823309380c8135fc7f52e 100644 (file)
--- a/project/libCEC.nsi
+++ b/project/libCEC.nsi
@@ -155,13 +155,14 @@ Section "CEC debug client" SecCecClient
   SetOutPath "$INSTDIR"
 
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk" "$INSTDIR\cec-client.exe" \
-    "" "$INSTDIR\cec-client.exe" 0 SW_SHOWNORMAL \
-    "" "Start the CEC Test client."
   ${If} ${RunningX64}
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk" "$INSTDIR\x64\cec-client.x64.exe" \
       "" "$INSTDIR\cec-client.x64.exe" 0 SW_SHOWNORMAL \
       "" "Start the CEC Test client (x64)."
+  ${Else}
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk" "$INSTDIR\cec-client.exe" \
+      "" "$INSTDIR\cec-client.exe" 0 SW_SHOWNORMAL \
+      "" "Start the CEC Test client."
   ${EndIf}
   !insertmacro MUI_STARTMENU_WRITE_END  
     
@@ -181,13 +182,14 @@ Section "CEC configuration tool" SecCecConfig
   SetOutPath "$INSTDIR"
 
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration.lnk" "$INSTDIR\cec-config-gui.exe" \
-    "" "$INSTDIR\cec-config-gui.exe" 0 SW_SHOWNORMAL \
-    "" "Start the CEC Adapter Configuration tool."
   ${If} ${RunningX64}
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration (x64).lnk" "$INSTDIR\x64\cec-config-gui.exe" \
       "" "$INSTDIR\x64\cec-config-gui.exe" 0 SW_SHOWNORMAL \
       "" "Start the CEC Adapter Configuration tool (x64)."
+  ${Else}
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Adapter Configuration.lnk" "$INSTDIR\cec-config-gui.exe" \
+      "" "$INSTDIR\cec-config-gui.exe" 0 SW_SHOWNORMAL \
+      "" "Start the CEC Adapter Configuration tool."
   ${EndIf}
   !insertmacro MUI_STARTMENU_WRITE_END  
     

diff --git a/project/libcec.rc b/project/libcec.rc
index da6bd00d95b28a3cf6b842f27da62b121d2c267f..6e422e2fadf0e493a45416c2ff45c96c11d68eb6 100644 (file)
Binary files a/project/libcec.rc and b/project/libcec.rc differ

diff --git a/project/testclient.rc b/project/testclient.rc
index f09738fe58d5786494524d69129ca7fae063efd5..1a3b7792d3e6d20e08702572f047441c9fbbec2f 100644 (file)
Binary files a/project/testclient.rc and b/project/testclient.rc differ

diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs
index 6075440fc7da8e10ad5daf2d035a549129e3d696..0f0423893609eff36911d4ba8505647ea0b65c08 100644 (file)
--- a/src/CecSharpTester/Properties/AssemblyInfo.cs
+++ b/src/CecSharpTester/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.3.0")]
-[assembly: AssemblyFileVersion("1.4.3.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]

diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp
index 0520cc759745090e425a9069b627a723b3c3cd78..ef09f79aed5ca5bcf76c77c2292721aa5b5f332b 100644 (file)
--- a/src/LibCecSharp/AssemblyInfo.cpp
+++ b/src/LibCecSharp/AssemblyInfo.cpp
@@ -13,7 +13,7 @@ using namespace System::Security::Permissions;
 [assembly:AssemblyTrademarkAttribute("")];
 [assembly:AssemblyCultureAttribute("")];
 
-[assembly:AssemblyVersionAttribute("1.4.3.0")];
+[assembly:AssemblyVersionAttribute("1.5.0.0")];
 
 [assembly:ComVisible(false)];
 [assembly:CLSCompliantAttribute(true)];

diff --git a/src/cec-config-gui/CecConfigGUI.cs b/src/cec-config-gui/CecConfigGUI.cs
index e3decec7fe03ef9907b602182cc21f214f52136b..e3b1a0607742f3383c07c4ffa2cd73fc3f793331 100644 (file)
--- a/src/cec-config-gui/CecConfigGUI.cs
+++ b/src/cec-config-gui/CecConfigGUI.cs
@@ -582,6 +582,7 @@ namespace CecConfigGui
 
               // only supported by 1.5.0+ clients
               output.AppendLine("<!-- the following lines are only supported by v1.5.0+ clients -->");
+              output.AppendLine("<setting id=\"activate_source\" value=\"" + (Config.ActivateSource ? 1 : 0) + "\" />");
               output.AppendLine("<setting id=\"physical_address\" value=\"" + string.Format("{0,4:X}", Config.PhysicalAddress) + "\" />");
               output.AppendLine("<setting id=\"device_type\" value=\"" + (int)Config.DeviceTypes.Types[0] + "\" />");
               output.AppendLine("<setting id=\"tv_vendor\" value=\"" + string.Format("{0,6:X}", (int)Config.TvVendor).Trim() + "\" />");

diff --git a/src/cec-config-gui/Properties/AssemblyInfo.cs b/src/cec-config-gui/Properties/AssemblyInfo.cs
index ead3cf8a04f09b022719dd821a84fa3a007d958c..b99c5531cd1e6344b8af3de4ec1b8ca98d621d10 100644 (file)
--- a/src/cec-config-gui/Properties/AssemblyInfo.cs
+++ b/src/cec-config-gui/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("cec-config-gui")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyCompany("Pulse-Eight Ltd.")]
 [assembly: AssemblyProduct("cec-config-gui")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2012")]
+[assembly: AssemblyCopyright("Copyright (c) Pulse-Eight Ltd. 2011-2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]

diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 01ce2cf3e406f20904dc6b39413ca27e2b93f909..26748ab7e1436b43d597d2d400b60343001c79a1 100644 (file)
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -581,3 +581,10 @@ void CLibCEC::RescanActiveDevices(void)
 {
   return m_cec->RescanActiveDevices();
 }
+
+bool CLibCEC::IsLibCECActiveSource(void)
+{
+  return m_cec ?
+      m_cec->m_busDevices[m_cec->GetActiveSource()]->GetStatus(false) == CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC :
+      false;
+}

diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h
index a2ed9ac09bd9e1fde849ecd35211f85773d7b37f..e2e815392d1bef72bd31b5ef4998b3cc35a1a722 100644 (file)
--- a/src/lib/LibCEC.h
+++ b/src/lib/LibCEC.h
@@ -107,6 +107,7 @@ namespace CEC
       virtual bool CanPersistConfiguration(void);
       virtual bool PersistConfiguration(libcec_configuration *configuration);
       virtual void RescanActiveDevices(void);
+      virtual bool IsLibCECActiveSource(void);
 
       const char *ToString(const cec_menu_state state);
       const char *ToString(const cec_version version);

diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp
index b87e06c611f28946a58331a26d9d73e6e25e0d6b..29b08fd98ce429570f57c3e75b69ca69c3c36763 100644 (file)
--- a/src/lib/LibCECC.cpp
+++ b/src/lib/LibCECC.cpp
@@ -416,4 +416,9 @@ void cec_rescan_devices(void)
     cec_parser->RescanActiveDevices();
 }
 
+int cec_is_libcec_active_source(void)
+{
+  return cec_parser ? (cec_parser->IsLibCECActiveSource() ? 1 : 0) : -1;
+}
+
 //@}