From: Lars Op den Kamp Date: Thu, 16 Feb 2012 18:48:02 +0000 (+0100) Subject: cec: bump version numbers to 1.5, to prepare for the new release X-Git-Tag: upstream/2.2.0~1^2~35^2~21 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=c9549d3519b254239eac22685ea22d81ffa00761;p=deb_libcec.git cec: bump version numbers to 1.5, to prepare for the new release --- diff --git a/configure.ac b/configure.ac index b40687a..b7a4b60 100644 --- 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 a3a674e..4a6ad98 100644 --- 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 22fb9a3..7e3512f 100644 --- 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 960f6a0..5f25b94 100644 --- 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 37783a2..07a6324 100644 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 1803809..bff402d 100644 --- 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 da6bd00..6e422e2 100644 Binary files a/project/libcec.rc and b/project/libcec.rc differ diff --git a/project/testclient.rc b/project/testclient.rc index f09738f..1a3b779 100644 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 6075440..0f04238 100644 --- 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 0520cc7..ef09f79 100644 --- 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 e3decec..e3b1a06 100644 --- 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(""); + output.AppendLine(""); output.AppendLine(""); output.AppendLine(""); output.AppendLine(""); diff --git a/src/cec-config-gui/Properties/AssemblyInfo.cs b/src/cec-config-gui/Properties/AssemblyInfo.cs index ead3cf8..b99c553 100644 --- 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 01ce2cf..26748ab 100644 --- 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 a2ed9ac..e2e8153 100644 --- 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 b87e06c..29b08fd 100644 --- 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; +} + //@}