From: Lars Op den Kamp Date: Tue, 2 Oct 2012 11:59:46 +0000 (+0200) Subject: bump to v2.0.0-pre. don't build cec-config.exe on windows (there's a gui version) X-Git-Tag: upstream/2.2.0~1^2~17^2^2~53 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=f81c0652a60fc95dd880bdbf279e61801c5cc1ec;p=deb_libcec.git bump to v2.0.0-pre. don't build cec-config.exe on windows (there's a gui version) --- diff --git a/include/cec.h b/include/cec.h index 40df4ce..fa612ce 100644 --- a/include/cec.h +++ b/include/cec.h @@ -36,7 +36,7 @@ #include "cectypes.h" -#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_1_9_0 +#define LIBCEC_VERSION_CURRENT CEC_SERVER_VERSION_1_99_0 namespace CEC { diff --git a/include/cectypes.h b/include/cectypes.h index 621e19f..b8bc0df 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -1182,7 +1182,8 @@ typedef enum cec_client_version CEC_CLIENT_VERSION_1_8_0 = 0x1800, CEC_CLIENT_VERSION_1_8_1 = 0x1801, CEC_CLIENT_VERSION_1_8_2 = 0x1802, - CEC_CLIENT_VERSION_1_9_0 = 0x1900 + CEC_CLIENT_VERSION_1_9_0 = 0x1900, + CEC_CLIENT_VERSION_1_99_0 = 0x1990, } cec_client_version; typedef enum cec_server_version @@ -1202,21 +1203,22 @@ typedef enum cec_server_version CEC_SERVER_VERSION_1_8_0 = 0x1800, CEC_SERVER_VERSION_1_8_1 = 0x1801, CEC_SERVER_VERSION_1_8_2 = 0x1802, - CEC_SERVER_VERSION_1_9_0 = 0x1900 + CEC_SERVER_VERSION_1_9_0 = 0x1900, + CEC_SERVER_VERSION_1_99_0 = 0x1990, } cec_server_version; struct libcec_configuration { uint32_t clientVersion; /*!< the version of the client that is connecting */ - char strDeviceName[13]; /*!< how to name the device on the CEC bus */ - cec_device_type_list deviceTypes; /*!< the CEC device types to emulate */ + char strDeviceName[13]; /*!< the device name to use on the CEC bus */ + cec_device_type_list deviceTypes; /*!< the device type(s) to use on the CEC bus for libCEC */ uint8_t bAutodetectAddress; /*!< (read only) set to 1 by libCEC when the physical address was autodetected */ - uint16_t iPhysicalAddress; /*!< the physical address of the CEC adapter. only used when bAutodetectAddress = 0 or when the adapter doesn't support autodetection */ - cec_logical_address baseDevice; /*!< the logical address of the device to which the adapter is connected. only used when iPhysicalAddress = 0 and bAutodetectAddress = 0 or when the adapter doesn't support autodetection */ - uint8_t iHDMIPort; /*!< the HDMI port to which the adapter is connected. only used when iPhysicalAddress = 0 and bAutodetectAddress = 0 or when the adapter doesn't support autodetection */ + uint16_t iPhysicalAddress; /*!< the physical address of the CEC adapter */ + cec_logical_address baseDevice; /*!< the logical address of the device to which the adapter is connected. only used when iPhysicalAddress = 0 or when the adapter doesn't support autodetection */ + uint8_t iHDMIPort; /*!< the HDMI port to which the adapter is connected. only used when iPhysicalAddress = 0 or when the adapter doesn't support autodetection */ uint64_t tvVendor; /*!< override the vendor ID of the TV. leave this untouched to autodetect */ - 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 */ + cec_logical_addresses wakeDevices; /*!< list of devices to wake when initialising libCEC or when calling PowerOnDevices() without any parameter. */ + cec_logical_addresses powerOffDevices; /*!< list of devices to power off when calling StandbyDevices() without any parameter. */ uint32_t serverVersion; /*!< the version number of the server. read-only */ diff --git a/project/libcec.rc b/project/libcec.rc index 7b488df..3ac6a81 100644 Binary files a/project/libcec.rc and b/project/libcec.rc differ diff --git a/project/libcec.sln b/project/libcec.sln index dbb86c9..83d6d89 100644 --- a/project/libcec.sln +++ b/project/libcec.sln @@ -8,11 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient.vc {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cec-config", "cec-config.vcxproj", "{00EE7081-9EEE-485C-B7CE-699A7BCA40C1}" - ProjectSection(ProjectDependencies) = postProject - {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -37,14 +32,6 @@ Global {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|Win32.Build.0 = Release|Win32 {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x64.ActiveCfg = Release|x64 {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x64.Build.0 = Release|x64 - {00EE7081-9EEE-485C-B7CE-699A7BCA40C1}.Debug|Win32.ActiveCfg = Debug|Win32 - {00EE7081-9EEE-485C-B7CE-699A7BCA40C1}.Debug|Win32.Build.0 = Debug|Win32 - {00EE7081-9EEE-485C-B7CE-699A7BCA40C1}.Debug|x64.ActiveCfg = Debug|x64 - {00EE7081-9EEE-485C-B7CE-699A7BCA40C1}.Debug|x64.Build.0 = Debug|x64 - {00EE7081-9EEE-485C-B7CE-699A7BCA40C1}.Release|Win32.ActiveCfg = Release|Win32 - {00EE7081-9EEE-485C-B7CE-699A7BCA40C1}.Release|Win32.Build.0 = Release|Win32 - {00EE7081-9EEE-485C-B7CE-699A7BCA40C1}.Release|x64.ActiveCfg = Release|x64 - {00EE7081-9EEE-485C-B7CE-699A7BCA40C1}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/project/testclient.rc b/project/testclient.rc index c227b7e..1e5f447 100644 Binary files a/project/testclient.rc and b/project/testclient.rc differ diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs index dca7ce0..f470171 100644 --- a/src/CecSharpTester/CecSharpClient.cs +++ b/src/CecSharpTester/CecSharpClient.cs @@ -43,7 +43,7 @@ namespace CecSharpClient Config = new LibCECConfiguration(); Config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice; Config.DeviceName = "CEC Tester"; - Config.ClientVersion = CecClientVersion.Version1_9_0; + Config.ClientVersion = CecClientVersion.Version1_99_0; Config.SetCallbacks(this); LogLevel = (int)CecLogLevel.All; diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp index 9f633ca..c3151e2 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.9.0.0")]; +[assembly:AssemblyVersionAttribute("1.99.0.0")]; [assembly:ComVisible(false)]; [assembly:CLSCompliantAttribute(true)]; diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h index a0110ad..c609526 100644 --- a/src/LibCecSharp/CecSharpTypes.h +++ b/src/LibCecSharp/CecSharpTypes.h @@ -917,6 +917,7 @@ namespace CecSharp GivePhysicalAddress = 0x83, /// /// Request language code of the menu language of a device + /// 3 character ISO 639-2 country code. see http://http://www.loc.gov/standards/iso639-2/ /// GetMenuLanguage = 0x91, /// @@ -925,6 +926,7 @@ namespace CecSharp ReportPhysicalAddress = 0x84, /// /// Report the language code of the menu language + /// 3 character ISO 639-2 country code. see http://http://www.loc.gov/standards/iso639-2/ /// SetMenuLanguage = 0x32, /// @@ -1153,7 +1155,11 @@ namespace CecSharp /// /// v1.9.0 /// - Version1_9_0 = 0x1900 + Version1_9_0 = 0x1900, + /// + /// v2.0.0-pre + /// + Version1_99_0 = 0x1990 }; /// @@ -1224,7 +1230,11 @@ namespace CecSharp /// /// v1.9.0 /// - Version1_9_0 = 0x1900 + Version1_9_0 = 0x1900, + /// + /// v2.0.0-pre + /// + Version1_99_0 = 0x1990 }; /// @@ -1733,22 +1743,22 @@ namespace CecSharp property CecDeviceTypeList ^ DeviceTypes; /// - /// True to try to autodetect the physical address, false otherwise + /// (read only) set to true by libCEC when the physical address was autodetected /// property bool AutodetectAddress; /// - /// The physical address that libCEC uses on the CEC bus + /// The physical address of the CEC adapter /// property uint16_t PhysicalAddress; /// - /// The logical address of the device to which the CEC adapter is connected, only used when PhysicalAddress isn't set + /// The logical address of the device to which the adapter is connected. Only used when PhysicalAddress = 0 or when the adapter doesn't support autodetection /// property CecLogicalAddress BaseDevice; /// - /// The hdmi port number on the device to which the CEC adapter is connected, only used when PhysicalAddress isn't set + /// The HDMI port to which the adapter is connected. Only used when iPhysicalAddress = 0 or when the adapter doesn't support autodetection /// property uint8_t HDMIPort; @@ -1763,7 +1773,7 @@ namespace CecSharp property CecServerVersion ServerVersion; /// - /// Override the vendor ID of the TV when set (for quirks mode) + /// Override the vendor ID of the TV. Leave this untouched to autodetect /// property CecVendorId TvVendor; @@ -1774,6 +1784,7 @@ namespace CecSharp /// /// Use the language setting of the TV in the client application. Must be implemented by the client application. + /// 3 character ISO 639-2 country code. see http://http://www.loc.gov/standards/iso639-2/ /// property bool UseTVMenuLanguage; @@ -1783,12 +1794,12 @@ namespace CecSharp property bool ActivateSource; /// - /// List of devices to send a power on command to when starting the client application + /// List of devices to wake when initialising libCEC or when calling PowerOnDevices() without any parameter. /// property CecLogicalAddresses ^WakeDevices; /// - /// List of devices to send a standby command to when exiting the client application + /// List of devices to power off when calling StandbyDevices() without any parameter. /// property CecLogicalAddresses ^PowerOffDevices; @@ -1821,6 +1832,10 @@ namespace CecSharp /// Send standby commands when the client application activates standby mode (S3). Must be implemented by the client application. /// property bool PowerOffDevicesOnStandby; + + /// + /// Shutdown this PC when the TV is switched off. only used when PowerOffOnStandby = false + /// property bool ShutdownOnStandby; /// @@ -1830,6 +1845,7 @@ namespace CecSharp /// /// The language code of the menu language that libCEC reports to other devices. + /// 3 character ISO 639-2 country code. see http://http://www.loc.gov/standards/iso639-2/ /// property System::String ^ DeviceLanguage; diff --git a/src/cec-config-gui/CecConfigGUI.cs b/src/cec-config-gui/CecConfigGUI.cs index 0e83c6a..f4353be 100644 --- a/src/cec-config-gui/CecConfigGUI.cs +++ b/src/cec-config-gui/CecConfigGUI.cs @@ -28,7 +28,7 @@ namespace CecConfigGui Config.DeviceTypes.Types[0] = CecDeviceType.RecordingDevice; Config.DeviceName = "CEC Config"; Config.GetSettingsFromROM = true; - Config.ClientVersion = CecClientVersion.Version1_9_0; + Config.ClientVersion = CecClientVersion.Version1_99_0; Callbacks = new CecCallbackWrapper(this); Config.SetCallbacks(Callbacks); LoadXMLConfiguration(ref Config); diff --git a/src/cec-config-gui/Properties/AssemblyInfo.cs b/src/cec-config-gui/Properties/AssemblyInfo.cs index 891de3e..a13c18b 100644 --- a/src/cec-config-gui/Properties/AssemblyInfo.cs +++ b/src/cec-config-gui/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.9.0.0")] -[assembly: AssemblyFileVersion("1.9.0.0")] +[assembly: AssemblyVersion("1.99.0.0")] +[assembly: AssemblyFileVersion("1.99.0.0")] diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h index da49f00..9635ccf 100644 --- a/src/lib/CECTypeUtils.h +++ b/src/lib/CECTypeUtils.h @@ -553,6 +553,8 @@ namespace CEC return "1.8.2"; case CEC_CLIENT_VERSION_1_9_0: return "1.9.0"; + case CEC_CLIENT_VERSION_1_99_0: + return "2.0.0-pre"; default: return "Unknown"; } @@ -594,6 +596,8 @@ namespace CEC return "1.8.2"; case CEC_SERVER_VERSION_1_9_0: return "1.9.0"; + case CEC_SERVER_VERSION_1_99_0: + return "2.0.0-pre"; default: return "Unknown"; } diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index 8150b8e..1609558 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -48,7 +48,7 @@ using namespace CEC; using namespace std; using namespace PLATFORM; -#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_1_9_0; +#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_1_99_0; #include "../../include/cecloader.h"