From: Lars Op den Kamp Date: Mon, 13 May 2013 13:09:14 +0000 (+0200) Subject: Merge branch 'master' into release X-Git-Tag: upstream/2.2.0~1^2~4 X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=54be21e43ea5b0268858e09f0252bb3909ef6132;hp=605d913ae656ef9707a7f9cbca41f78d180d79dc Merge branch 'master' into release --- diff --git a/.gitignore b/.gitignore index b912fbb..6336858 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ *.pdb *.suo *.user +*.aps *~ @@ -62,8 +63,17 @@ project/ipch/ project/libcec.sdf project/obj project/Properties - +project/_* project/x64 +project/LibCecSharp/x64 +project/LibCecSharp/Debug +project/LibCecSharp/Release +project/libcec/x64 +project/libcec/Debug +project/libcec/Release +project/testclient/x64 +project/testclient/Debug +project/testclient/Release project/RPi/toolchain project/RPi/firmware diff --git a/ChangeLog b/ChangeLog index ab93e67..0a17f5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +libcec (2.1.3-1) unstable; urgency=low + + * changed / added: + * ask users to send an email when receiving an unhandled vendor command + * toshiba: map top menu and dvd menu buttons. closes #148 + * LibCecSharp: sync alert types + * LibCecSharp: added CurrentVersion to the version enum + * CecSharpClient: use CurrentVersion instead of a hardcoded version + * CecTray: power management + * CecTray: split up asyncform + * CecTray: try/catch xml exceptions when reading the xml config. bugzid: + 2082 + * CecTray: use CurrentVersion instead of a hardcoded version + * CecTray: display a warning if we can't poll the TV + * CecTray: display alerts from libCEC + * CecTray: don't use lazy loading for the main controller, but pass the + instance. bugzid: 2082 + * windows: converted to vs2012 + * fixed: + * toshiba: toshiba handler wasn't initialised, and toshiba uses more than + one vendor id + * libCEC marked itself as inactive source when the stream path changed to + a device with a different physical address. bugzid: 2157 + * TDA995x: report proper firmware revision (credits: @warped-rudi) + * TDA995x: avoid callback when already stopped (credits: @warped-rudi) + * windows: fix resource files and backwards compat dll names + + -- Pulse-Eight Packaging Sat, 11 May 2013 10:06:00 +0000 + libcec (2.1.1-1) unstable; urgency=low * changed / added: diff --git a/README b/README index f25c539..3f2ee22 100644 --- a/README +++ b/README @@ -52,15 +52,16 @@ To compile, execute the following command: === Windows === =============================================================================== -To compile libCEC on Windows, you'll need Visual C++ 2010 or Visual Studio 2010 -The installer needs the Windows DDK (Driver Development Kit) and Nullsoft's -NSIS. +To compile libCEC on Windows, you'll need Visual Studio 2012 and Visual Studio +or Visual C++ 2008. The latter is needed to build LibCecSharp for .Net +Framework 2.0. -To compile LibCecSharp on Windows, you'll need Visual C++ 2008 or Visual Studio -2008, because it is compiled against .NET 2.0. +The adapter detection code needs the Windows DDK (Driver Development Kit). + +To create an installer, you'll need Nullsoft's NSIS. To compile libCEC, follow these instructions: -* open /project/libcec.sln with Visual C++ 2010 or Visual Studio 2010. +* open /project/libcec.sln with Visual Studio 2012. * build the project. To build an installer on Windows: @@ -68,12 +69,6 @@ To build an installer on Windows: * go to /project and execute create-installer.bat to create the installer. * the installer is stored as /build/libCEC-installer.exe -You will need both Visual Studio 2008 and Visual Studio 2010 to build the -installer from the command line. To build with Visual C++ 2008 and 2010, -you will need to manually build libcec with Visual C++ 2010 and then -build LibCecSharp.sln with Visual Studio 2008. See create-installer.bat -for the required steps. - =============================================================================== === Raspberry Pi === =============================================================================== diff --git a/debian/changelog b/debian/changelog index ab93e67..0a17f5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +libcec (2.1.3-1) unstable; urgency=low + + * changed / added: + * ask users to send an email when receiving an unhandled vendor command + * toshiba: map top menu and dvd menu buttons. closes #148 + * LibCecSharp: sync alert types + * LibCecSharp: added CurrentVersion to the version enum + * CecSharpClient: use CurrentVersion instead of a hardcoded version + * CecTray: power management + * CecTray: split up asyncform + * CecTray: try/catch xml exceptions when reading the xml config. bugzid: + 2082 + * CecTray: use CurrentVersion instead of a hardcoded version + * CecTray: display a warning if we can't poll the TV + * CecTray: display alerts from libCEC + * CecTray: don't use lazy loading for the main controller, but pass the + instance. bugzid: 2082 + * windows: converted to vs2012 + * fixed: + * toshiba: toshiba handler wasn't initialised, and toshiba uses more than + one vendor id + * libCEC marked itself as inactive source when the stream path changed to + a device with a different physical address. bugzid: 2157 + * TDA995x: report proper firmware revision (credits: @warped-rudi) + * TDA995x: avoid callback when already stopped (credits: @warped-rudi) + * windows: fix resource files and backwards compat dll names + + -- Pulse-Eight Packaging Sat, 11 May 2013 10:06:00 +0000 + libcec (2.1.1-1) unstable; urgency=low * changed / added: diff --git a/include/cectypes.h b/include/cectypes.h index e8670f8..01adebe 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -831,6 +831,7 @@ typedef enum cec_vendor_id CEC_VENDOR_LOEWE = 0x000982, CEC_VENDOR_ONKYO = 0x0009B0, CEC_VENDOR_MEDION = 0x000CB8, + CEC_VENDOR_TOSHIBA2 = 0x000CE7, CEC_VENDOR_AKAI = 0x0020C7, CEC_VENDOR_AOC = 0x002467, CEC_VENDOR_PANASONIC = 0x008045, @@ -915,6 +916,16 @@ typedef struct cec_datapacket return *this; } + bool operator ==(const struct cec_datapacket& packet) const + { + if (size != packet.size) + return false; + for (uint8_t iPtr = 0; iPtr < size; iPtr++) + if (packet.data[iPtr] != data[iPtr]) + return false; + return true; + } + bool IsEmpty(void) const { return size == 0; } /**< @return True when this packet is empty, false otherwise. */ bool IsFull(void) const { return size == 100; } /**< @return True when this packet is false, false otherwise. */ @@ -1407,7 +1418,9 @@ typedef enum cec_client_version CEC_CLIENT_VERSION_2_0_5 = 0x2005, CEC_CLIENT_VERSION_2_1_0 = 0x2100, CEC_CLIENT_VERSION_2_1_1 = 0x2101, - CEC_CLIENT_VERSION_CURRENT = 0x2101 + CEC_CLIENT_VERSION_2_1_2 = 0x2102, + CEC_CLIENT_VERSION_2_1_3 = 0x2103, + CEC_CLIENT_VERSION_CURRENT = 0x2103 } cec_client_version; typedef enum cec_server_version @@ -1437,7 +1450,9 @@ typedef enum cec_server_version CEC_SERVER_VERSION_2_0_5 = 0x2005, CEC_SERVER_VERSION_2_1_0 = 0x2100, CEC_SERVER_VERSION_2_1_1 = 0x2101, - CEC_SERVER_VERSION_CURRENT = 0x2101 + CEC_SERVER_VERSION_2_1_2 = 0x2102, + CEC_SERVER_VERSION_2_1_3 = 0x2103, + CEC_SERVER_VERSION_CURRENT = 0x2103 } cec_server_version; struct libcec_configuration diff --git a/project/LibCecSharp.sln b/project/LibCecSharp.sln deleted file mode 100644 index 7b9b1db..0000000 --- a/project/LibCecSharp.sln +++ /dev/null @@ -1,46 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CecSharpTester", "..\src\CecSharpTester\CecSharpTester.csproj", "{B6A7F3A9-F47C-41E5-9754-0BFF233B1172}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibCecSharp", "LibCecSharp.vcproj", "{E54D4581-CD59-4687-BB10-694B8192EABA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibCECTray", "..\src\LibCecTray\LibCECTray.csproj", "{58C106FE-C159-46D3-97E1-73AB83232670}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.ActiveCfg = Debug|x64 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.Build.0 = Debug|x64 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.ActiveCfg = Debug|x86 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.Build.0 = Debug|x86 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.ActiveCfg = Release|x64 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.Build.0 = Release|x64 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.ActiveCfg = Release|x86 - {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.Build.0 = Release|x86 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.ActiveCfg = Debug|x64 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.Build.0 = Debug|x64 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.ActiveCfg = Debug|Win32 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.Build.0 = Debug|Win32 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.ActiveCfg = Release|x64 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.Build.0 = Release|x64 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.ActiveCfg = Release|Win32 - {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.Build.0 = Release|Win32 - {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.ActiveCfg = Debug|x64 - {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.Build.0 = Debug|x64 - {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.ActiveCfg = Debug|x86 - {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.Build.0 = Debug|x86 - {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.ActiveCfg = Release|x64 - {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.Build.0 = Release|x64 - {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.ActiveCfg = Release|x86 - {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/project/LibCecSharp.vcproj b/project/LibCecSharp.vcproj deleted file mode 100644 index 7bce4c0..0000000 --- a/project/LibCecSharp.vcproj +++ /dev/null @@ -1,381 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/project/LibCecSharp/LibCecSharp.rc b/project/LibCecSharp/LibCecSharp.rc new file mode 100644 index 0000000..81ae7b4 Binary files /dev/null and b/project/LibCecSharp/LibCecSharp.rc differ diff --git a/project/LibCecSharp/LibCecSharp.vcxproj b/project/LibCecSharp/LibCecSharp.vcxproj new file mode 100644 index 0000000..b909be6 --- /dev/null +++ b/project/LibCecSharp/LibCecSharp.vcxproj @@ -0,0 +1,208 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E54D4581-CD59-4687-BB10-694B8192EABA} + LibCecSharp + ManagedCProj + v2.0 + + + + DynamicLibrary + v90 + Unicode + true + true + + + DynamicLibrary + v90 + Unicode + true + + + DynamicLibrary + v90 + Unicode + true + true + + + DynamicLibrary + v90 + Unicode + true + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.50727.1 + + + $(SolutionDir)..;$(ReferencePath) + $(SolutionDir)..\build\ + $(Configuration)\ + + + $(SolutionDir)..;$(ReferencePath) + $(SolutionDir)..\build\x64\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)..;$(ReferencePath) + $(SolutionDir)..\build\ + $(Configuration)\ + false + + + $(SolutionDir)..;$(ReferencePath) + $(SolutionDir)..\build\x64\ + $(Platform)\$(Configuration)\ + + + + X64 + + + Disabled + $(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories) + _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + true + Level3 + true + ProgramDatabase + + + $(OutDir)libcec.lib;%(AdditionalDependencies) + true + true + MachineX86 + + + + + X64 + + + Disabled + $(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories) + _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + true + Level3 + true + ProgramDatabase + + + $(OutDir)libcec.lib;%(AdditionalDependencies) + true + true + MachineX64 + + + + + X64 + + + $(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories) + NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + + true + Level3 + true + ProgramDatabase + + + $(OutDir)libcec.lib;%(AdditionalDependencies) + true + MachineX86 + + + + + X64 + + + $(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\lib\platform\windows;%(AdditionalIncludeDirectories) + NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + + true + Level3 + true + ProgramDatabase + + + $(OutDir)libcec.lib;%(AdditionalDependencies) + + + + + true + true + + + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/LibCecSharp/LibCecSharp.vcxproj.filters b/project/LibCecSharp/LibCecSharp.vcxproj.filters new file mode 100644 index 0000000..c879eb2 --- /dev/null +++ b/project/LibCecSharp/LibCecSharp.vcxproj.filters @@ -0,0 +1,41 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/project/LibCecSharp/resource.h b/project/LibCecSharp/resource.h new file mode 100644 index 0000000..69b5323 Binary files /dev/null and b/project/LibCecSharp/resource.h differ diff --git a/project/libCEC.nsi b/project/libCEC.nsi index a7516d6..a539dc7 100644 --- a/project/libCEC.nsi +++ b/project/libCEC.nsi @@ -7,7 +7,7 @@ !include "LogicLib.nsh" !include "x64.nsh" -Name "Pulse-Eight libCEC version 2.1.1" +Name "Pulse-Eight libCEC" OutFile "..\build\libCEC-installer.exe" XPStyle on @@ -153,15 +153,15 @@ Section "CEC Debug Client" SecCecClient SetOutPath "$INSTDIR" File /x p8-usbcec-driver-installer.exe /x cec-tray.exe "..\build\*.exe" SetOutPath "$INSTDIR\x64" - File /nonfatal /x cec-tray.exe "..\build\x64\*.exe" + File /nonfatal "..\build\x64\*.exe" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application SetOutPath "$INSTDIR" CreateDirectory "$SMPROGRAMS\$StartMenuFolder" ${If} ${RunningX64} - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk" "$INSTDIR\x64\cec-client.x64.exe" \ - "" "$INSTDIR\cec-client.x64.exe" 0 SW_SHOWNORMAL \ + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client (x64).lnk" "$INSTDIR\x64\cec-client.exe" \ + "" "$INSTDIR\x64\cec-client.exe" 0 SW_SHOWNORMAL \ "" "Start the CEC Test client (x64)." ${Else} CreateShortCut "$SMPROGRAMS\$StartMenuFolder\CEC Test client.lnk" "$INSTDIR\cec-client.exe" \ diff --git a/project/libcec.filters b/project/libcec.filters deleted file mode 100644 index efb6144..0000000 --- a/project/libcec.filters +++ /dev/null @@ -1,63 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/project/libcec.sln b/project/libcec.sln index 83d6d89..ea52210 100644 --- a/project/libcec.sln +++ b/project/libcec.sln @@ -1,37 +1,72 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcec", "libcec.vcxproj", "{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcec", "libcec\libcec.vcxproj", "{C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient.vcxproj", "{F01222BF-6B3D-43BD-B254-434031CB9887}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient\testclient.vcxproj", "{F01222BF-6B3D-43BD-B254-434031CB9887}" ProjectSection(ProjectDependencies) = postProject {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibCecSharp", "LibCecSharp\LibCecSharp.vcxproj", "{E54D4581-CD59-4687-BB10-694B8192EABA}" + ProjectSection(ProjectDependencies) = postProject + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} = {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B119505D-5CD1-48E4-BED1-9C2BF26153D5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CecSharpTester", "..\src\CecSharpTester\CecSharpTester.csproj", "{B6A7F3A9-F47C-41E5-9754-0BFF233B1172}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibCECTray", "..\src\LibCecTray\LibCECTray.csproj", "{58C106FE-C159-46D3-97E1-73AB83232670}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|Win32.ActiveCfg = Debug|Win32 - {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|Win32.Build.0 = Debug|Win32 {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x64.ActiveCfg = Debug|x64 {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x64.Build.0 = Debug|x64 - {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|Win32.ActiveCfg = Release|Win32 - {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|Win32.Build.0 = Release|Win32 + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x86.ActiveCfg = Debug|Win32 + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Debug|x86.Build.0 = Debug|Win32 {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x64.ActiveCfg = Release|x64 {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x64.Build.0 = Release|x64 - {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|Win32.ActiveCfg = Debug|Win32 - {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|Win32.Build.0 = Debug|Win32 + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x86.ActiveCfg = Release|Win32 + {C04B0FB1-667D-4F1C-BDAE-A07CDFFAAAA0}.Release|x86.Build.0 = Release|Win32 {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x64.ActiveCfg = Debug|x64 {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x64.Build.0 = Debug|x64 - {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|Win32.ActiveCfg = Release|Win32 - {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|Win32.Build.0 = Release|Win32 + {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x86.ActiveCfg = Debug|Win32 + {F01222BF-6B3D-43BD-B254-434031CB9887}.Debug|x86.Build.0 = Debug|Win32 {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x64.ActiveCfg = Release|x64 {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x64.Build.0 = Release|x64 + {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x86.ActiveCfg = Release|Win32 + {F01222BF-6B3D-43BD-B254-434031CB9887}.Release|x86.Build.0 = Release|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.ActiveCfg = Debug|x64 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x64.Build.0 = Debug|x64 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.ActiveCfg = Debug|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Debug|x86.Build.0 = Debug|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.ActiveCfg = Release|x64 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x64.Build.0 = Release|x64 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.ActiveCfg = Release|Win32 + {E54D4581-CD59-4687-BB10-694B8192EABA}.Release|x86.Build.0 = Release|Win32 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.ActiveCfg = Debug|x64 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x64.Build.0 = Debug|x64 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.ActiveCfg = Debug|x86 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Debug|x86.Build.0 = Debug|x86 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.ActiveCfg = Release|x64 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x64.Build.0 = Release|x64 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.ActiveCfg = Release|x86 + {B6A7F3A9-F47C-41E5-9754-0BFF233B1172}.Release|x86.Build.0 = Release|x86 + {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.ActiveCfg = Debug|x64 + {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x64.Build.0 = Debug|x64 + {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.ActiveCfg = Debug|x86 + {58C106FE-C159-46D3-97E1-73AB83232670}.Debug|x86.Build.0 = Debug|x86 + {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.ActiveCfg = Release|x64 + {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x64.Build.0 = Release|x64 + {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.ActiveCfg = Release|x86 + {58C106FE-C159-46D3-97E1-73AB83232670}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/project/libcec.rc b/project/libcec/libcec.rc similarity index 55% rename from project/libcec.rc rename to project/libcec/libcec.rc index 0f65c99..dd5aea5 100644 Binary files a/project/libcec.rc and b/project/libcec/libcec.rc differ diff --git a/project/libcec.vcxproj b/project/libcec/libcec.vcxproj similarity index 61% rename from project/libcec.vcxproj rename to project/libcec/libcec.vcxproj index 271d0df..b8db0b1 100644 --- a/project/libcec.vcxproj +++ b/project/libcec/libcec.vcxproj @@ -19,88 +19,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -115,21 +116,25 @@ DynamicLibrary true MultiByte + v110 DynamicLibrary true MultiByte + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte + v110 @@ -151,13 +156,13 @@ $(SolutionDir)..\build\ - $(SolutionDir)..\build\ + $(SolutionDir)..\build\x64\ libcec - $(ProjectName).x64 + $(ProjectName) $(SolutionDir)..\include;$(IncludePath) @@ -174,8 +179,8 @@ C:\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) - $(SolutionDir)..\build\ - $(ProjectName).x64 + $(SolutionDir)..\build\x64\ + $(ProjectName) $(SolutionDir)..\include;$(IncludePath) C:\WinDDK\7600.16385.1\lib\win7\amd64;$(LibraryPath) @@ -269,4 +274,4 @@ - + \ No newline at end of file diff --git a/project/libcec.vcxproj.filters b/project/libcec/libcec.vcxproj.filters similarity index 51% rename from project/libcec.vcxproj.filters rename to project/libcec/libcec.vcxproj.filters index f966a2b..b9e41ed 100644 --- a/project/libcec.vcxproj.filters +++ b/project/libcec/libcec.vcxproj.filters @@ -39,226 +39,227 @@ - - - + + + exports - + exports - + exports - + exports - + implementations - + implementations - + implementations - + devices - + implementations - + devices - + devices - + devices - + devices - + devices - + platform - + platform\sockets - + platform\sockets - + platform\sockets - + platform\util - + platform\util - + platform\util - + platform\util - + platform\threads - + platform\threads - + platform\windows - + platform\windows - + platform\windows - + platform\windows - + implementations - + implementations - - - + + + devices - - + + platform\util - + platform\adl - + platform\adl - + platform\adl - + platform\adl - + platform\windows - + platform\nvidia - + adapter - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter + - - - - - + + + + + implementations - + implementations - + implementations - + devices - + implementations - + devices - + devices - + devices - + devices - + devices - + platform\windows - + platform\windows - + implementations - + implementations - - + + devices - + platform\windows - + platform\adl - + platform\windows - + platform\nvidia - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter\Pulse-Eight - + adapter diff --git a/project/libcec/resource.h b/project/libcec/resource.h new file mode 100644 index 0000000..84edc7f Binary files /dev/null and b/project/libcec/resource.h differ diff --git a/project/testclient/resource.h b/project/testclient/resource.h new file mode 100644 index 0000000..84edc7f Binary files /dev/null and b/project/testclient/resource.h differ diff --git a/project/testclient.rc b/project/testclient/testclient.rc similarity index 55% rename from project/testclient.rc rename to project/testclient/testclient.rc index 20d3b90..5be5437 100644 Binary files a/project/testclient.rc and b/project/testclient/testclient.rc differ diff --git a/project/testclient.vcxproj b/project/testclient/testclient.vcxproj similarity index 89% rename from project/testclient.vcxproj rename to project/testclient/testclient.vcxproj index 53cebe5..9e910ac 100644 --- a/project/testclient.vcxproj +++ b/project/testclient/testclient.vcxproj @@ -28,21 +28,25 @@ Application true MultiByte + v110 Application true MultiByte + v110 Application false MultiByte + v110 Application false MultiByte + v110 @@ -65,16 +69,16 @@ cec-client - $(SolutionDir)..\build\ - cec-client.x64 + $(SolutionDir)..\build\x64\ + cec-client $(SolutionDir)..\build\ cec-client - $(SolutionDir)..\build\ - cec-client.x64 + $(SolutionDir)..\build\x64\ + cec-client @@ -86,7 +90,7 @@ true - $(SolutiontDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) + $(SolutiontDir)..\..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) Console @@ -105,7 +109,7 @@ true - $(SolutiontDir)..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) + $(SolutiontDir)..\..\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories) Console @@ -166,12 +170,13 @@ - - + + + - - + + diff --git a/project/testclient.vcxproj.filters b/project/testclient/testclient.vcxproj.filters similarity index 71% rename from project/testclient.vcxproj.filters rename to project/testclient/testclient.vcxproj.filters index 0fd21fb..dc4300d 100644 --- a/project/testclient.vcxproj.filters +++ b/project/testclient/testclient.vcxproj.filters @@ -9,16 +9,17 @@ - + exports - + exports + - - + + platform diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs index e3d22f6..d2ab990 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.Version2_1_0; + Config.ClientVersion = CecClientVersion.CurrentVersion; Config.SetCallbacks(this); LogLevel = (int)CecLogLevel.All; diff --git a/src/CecSharpTester/CecSharpTester.csproj b/src/CecSharpTester/CecSharpTester.csproj index eb00508..158f9d5 100644 --- a/src/CecSharpTester/CecSharpTester.csproj +++ b/src/CecSharpTester/CecSharpTester.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -12,17 +12,22 @@ CecSharpTester v2.0 512 + + + + + 3.5 true - ..\..\build\ + ..\..\build\x64\ DEBUG;TRACE full x64 prompt - ..\..\build\ + ..\..\build\x64\ TRACE true pdbonly @@ -51,17 +56,16 @@ + - + {E54D4581-CD59-4687-BB10-694B8192EABA} LibCecSharp - - - +