repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5477a25
)
cec: sync win32
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Wed, 25 Jan 2012 14:49:05 +0000
(15:49 +0100)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Wed, 25 Jan 2012 14:49:05 +0000
(15:49 +0100)
project/libcec.vcxproj
patch
|
blob
|
blame
|
history
project/libcec.vcxproj.filters
patch
|
blob
|
blame
|
history
src/lib/adapter/AdapterCommunication.cpp
patch
|
blob
|
blame
|
history
src/lib/adapter/AdapterCommunication.h
patch
|
blob
|
blame
|
history
src/lib/adapter/AdapterDetection.cpp
patch
|
blob
|
blame
|
history
diff --git
a/project/libcec.vcxproj
b/project/libcec.vcxproj
index fa96f6dcb9c4d13955b6cda282e6a0081effb9f4..70231936e635ddb4fdff6cb64fa7d799f6416519 100644
(file)
--- a/
project/libcec.vcxproj
+++ b/
project/libcec.vcxproj
@@
-23,8
+23,9
@@
<ClInclude Include="..\include\cecc.h" />
<ClInclude Include="..\include\cecloader.h" />
<ClInclude Include="..\include\cectypes.h" />
<ClInclude Include="..\include\cecc.h" />
<ClInclude Include="..\include\cecloader.h" />
<ClInclude Include="..\include\cectypes.h" />
- <ClInclude Include="..\src\lib\AdapterCommunication.h" />
- <ClInclude Include="..\src\lib\AdapterDetection.h" />
+ <ClInclude Include="..\src\lib\adapter\AdapterCommunication.h" />
+ <ClInclude Include="..\src\lib\adapter\AdapterDetection.h" />
+ <ClInclude Include="..\src\lib\adapter\AdapterMessage.h" />
<ClInclude Include="..\src\lib\CECProcessor.h" />
<ClInclude Include="..\src\lib\devices\CECAudioSystem.h" />
<ClInclude Include="..\src\lib\devices\CECBusDevice.h" />
<ClInclude Include="..\src\lib\CECProcessor.h" />
<ClInclude Include="..\src\lib\devices\CECAudioSystem.h" />
<ClInclude Include="..\src\lib\devices\CECBusDevice.h" />
@@
-49,8
+50,8
@@
<ClInclude Include="..\src\lib\platform\windows\os-types.h" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\lib\platform\windows\os-types.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\src\lib\AdapterCommunication.cpp" />
- <ClCompile Include="..\src\lib\AdapterDetection.cpp" />
+ <ClCompile Include="..\src\lib\
adapter\
AdapterCommunication.cpp" />
+ <ClCompile Include="..\src\lib\
adapter\
AdapterDetection.cpp" />
<ClCompile Include="..\src\lib\CECProcessor.cpp" />
<ClCompile Include="..\src\lib\devices\CECAudioSystem.cpp" />
<ClCompile Include="..\src\lib\devices\CECBusDevice.cpp" />
<ClCompile Include="..\src\lib\CECProcessor.cpp" />
<ClCompile Include="..\src\lib\devices\CECAudioSystem.cpp" />
<ClCompile Include="..\src\lib\devices\CECBusDevice.cpp" />
diff --git
a/project/libcec.vcxproj.filters
b/project/libcec.vcxproj.filters
index 1298c5c374bc4092c659f6cde11316bc5be12961..37a07ba87a43669e843baf5efa837f20562876b5 100644
(file)
--- a/
project/libcec.vcxproj.filters
+++ b/
project/libcec.vcxproj.filters
@@
-22,10
+22,11
@@
<Filter Include="platform\threads">
<UniqueIdentifier>{38a27e9e-86ad-46f6-a4fb-e1e524267b74}</UniqueIdentifier>
</Filter>
<Filter Include="platform\threads">
<UniqueIdentifier>{38a27e9e-86ad-46f6-a4fb-e1e524267b74}</UniqueIdentifier>
</Filter>
+ <Filter Include="adapter">
+ <UniqueIdentifier>{51614b77-8a0e-47a8-8500-5beb0fd12d49}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\src\lib\AdapterCommunication.h" />
- <ClInclude Include="..\src\lib\AdapterDetection.h" />
<ClInclude Include="..\src\lib\CECProcessor.h" />
<ClInclude Include="..\src\lib\LibCEC.h" />
<ClInclude Include="..\src\lib\platform\timeutils.h">
<ClInclude Include="..\src\lib\CECProcessor.h" />
<ClInclude Include="..\src\lib\LibCEC.h" />
<ClInclude Include="..\src\lib\platform\timeutils.h">
@@
-100,10
+101,17
@@
<ClInclude Include="..\src\lib\platform\StdString.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\src\lib\platform\StdString.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\src\lib\adapter\AdapterCommunication.h">
+ <Filter>adapter</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\lib\adapter\AdapterDetection.h">
+ <Filter>adapter</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\lib\adapter\AdapterMessage.h">
+ <Filter>adapter</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\src\lib\AdapterCommunication.cpp" />
- <ClCompile Include="..\src\lib\AdapterDetection.cpp" />
<ClCompile Include="..\src\lib\CECProcessor.cpp" />
<ClCompile Include="..\src\lib\LibCEC.cpp" />
<ClCompile Include="..\src\lib\LibCECC.cpp" />
<ClCompile Include="..\src\lib\CECProcessor.cpp" />
<ClCompile Include="..\src\lib\LibCEC.cpp" />
<ClCompile Include="..\src\lib\LibCECC.cpp" />
@@
-141,6
+149,12
@@
<ClCompile Include="..\src\lib\platform\windows\serialport.cpp">
<Filter>platform\serialport</Filter>
</ClCompile>
<ClCompile Include="..\src\lib\platform\windows\serialport.cpp">
<Filter>platform\serialport</Filter>
</ClCompile>
+ <ClCompile Include="..\src\lib\adapter\AdapterCommunication.cpp">
+ <Filter>adapter</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\lib\adapter\AdapterDetection.cpp">
+ <Filter>adapter</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="libcec.rc" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="libcec.rc" />
diff --git
a/src/lib/adapter/AdapterCommunication.cpp
b/src/lib/adapter/AdapterCommunication.cpp
index fd481d5b330571740402c58f17636ee6dc7dbb06..e143b08c3f9054e2a0e5b307df9e1600c4331c59 100644
(file)
--- a/
src/lib/adapter/AdapterCommunication.cpp
+++ b/
src/lib/adapter/AdapterCommunication.cpp
@@
-33,8
+33,8
@@
#include "AdapterCommunication.h"
#include "AdapterMessage.h"
#include "AdapterCommunication.h"
#include "AdapterMessage.h"
-#include "CECProcessor.h"
-#include "platform/serialport/serialport.h"
+#include "
../
CECProcessor.h"
+#include "
../
platform/serialport/serialport.h"
#include "../LibCEC.h"
using namespace std;
#include "../LibCEC.h"
using namespace std;
diff --git
a/src/lib/adapter/AdapterCommunication.h
b/src/lib/adapter/AdapterCommunication.h
index 3d74546d5e5b970a0ab93204fdea01591ac4f77e..5178e4f4c3717678c06b48940e7e84a2e101c30d 100644
(file)
--- a/
src/lib/adapter/AdapterCommunication.h
+++ b/
src/lib/adapter/AdapterCommunication.h
@@
-32,7
+32,7
@@
*/
#include <cectypes.h>
*/
#include <cectypes.h>
-#include "platform/os.h"
+#include "
../
platform/os.h"
namespace PLATFORM
{
namespace PLATFORM
{
diff --git
a/src/lib/adapter/AdapterDetection.cpp
b/src/lib/adapter/AdapterDetection.cpp
index 1f96348f12fa7f175a922ce00af0e6f9e5b354b9..596bfd88d9e1328175dd45875c9991f14e0d645b 100644
(file)
--- a/
src/lib/adapter/AdapterDetection.cpp
+++ b/
src/lib/adapter/AdapterDetection.cpp
@@
-31,7
+31,7
@@
*/
#include "AdapterDetection.h"
*/
#include "AdapterDetection.h"
-#include "platform/os.h"
+#include "
../
platform/os.h"
#if defined(__APPLE__)
#include <dirent.h>
#if defined(__APPLE__)
#include <dirent.h>