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:
2fbffb2
)
win32: sync project files and fixed compilation warnings.
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Fri, 11 May 2012 08:09:44 +0000
(10:09 +0200)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Fri, 11 May 2012 08:09:44 +0000
(10:09 +0200)
project/libcec.vcxproj
patch
|
blob
|
blame
|
history
project/libcec.vcxproj.filters
patch
|
blob
|
blame
|
history
src/lib/CECClient.cpp
patch
|
blob
|
blame
|
history
src/lib/LibCEC.cpp
patch
|
blob
|
blame
|
history
src/lib/devices/CECDeviceMap.cpp
patch
|
blob
|
blame
|
history
diff --git
a/project/libcec.vcxproj
b/project/libcec.vcxproj
index aed370cb44fbe04e1eff5e0cdd524018cf7a26ca..a5beb9f418d79981a6a547bcbdc4aed91ae3f652 100644
(file)
--- a/
project/libcec.vcxproj
+++ b/
project/libcec.vcxproj
@@
-29,9
+29,12
@@
<ClInclude Include="..\src\lib\adapter\USBCECAdapterDetection.h" />
<ClInclude Include="..\src\lib\adapter\USBCECAdapterMessage.h" />
<ClInclude Include="..\src\lib\adapter\USBCECAdapterMessageQueue.h" />
<ClInclude Include="..\src\lib\adapter\USBCECAdapterDetection.h" />
<ClInclude Include="..\src\lib\adapter\USBCECAdapterMessage.h" />
<ClInclude Include="..\src\lib\adapter\USBCECAdapterMessageQueue.h" />
+ <ClInclude Include="..\src\lib\CECClient.h" />
+ <ClInclude Include="..\src\lib\CECInputBuffer.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" />
+ <ClInclude Include="..\src\lib\devices\CECDeviceMap.h" />
<ClInclude Include="..\src\lib\devices\CECPlaybackDevice.h" />
<ClInclude Include="..\src\lib\devices\CECRecordingDevice.h" />
<ClInclude Include="..\src\lib\devices\CECTuner.h" />
<ClInclude Include="..\src\lib\devices\CECPlaybackDevice.h" />
<ClInclude Include="..\src\lib\devices\CECRecordingDevice.h" />
<ClInclude Include="..\src\lib\devices\CECTuner.h" />
@@
-63,9
+66,11
@@
<ClCompile Include="..\src\lib\adapter\USBCECAdapterDetection.cpp" />
<ClCompile Include="..\src\lib\adapter\USBCECAdapterMessage.cpp" />
<ClCompile Include="..\src\lib\adapter\USBCECAdapterMessageQueue.cpp" />
<ClCompile Include="..\src\lib\adapter\USBCECAdapterDetection.cpp" />
<ClCompile Include="..\src\lib\adapter\USBCECAdapterMessage.cpp" />
<ClCompile Include="..\src\lib\adapter\USBCECAdapterMessageQueue.cpp" />
+ <ClCompile Include="..\src\lib\CECClient.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" />
+ <ClCompile Include="..\src\lib\devices\CECDeviceMap.cpp" />
<ClCompile Include="..\src\lib\devices\CECPlaybackDevice.cpp" />
<ClCompile Include="..\src\lib\devices\CECRecordingDevice.cpp" />
<ClCompile Include="..\src\lib\devices\CECTuner.cpp" />
<ClCompile Include="..\src\lib\devices\CECPlaybackDevice.cpp" />
<ClCompile Include="..\src\lib\devices\CECRecordingDevice.cpp" />
<ClCompile Include="..\src\lib\devices\CECTuner.cpp" />
diff --git
a/project/libcec.vcxproj.filters
b/project/libcec.vcxproj.filters
index fdd9df3bf76398d27b6b680502dc402da9d0885a..f1205a5e2bc7657be680bad501a4538a683e3522 100644
(file)
--- a/
project/libcec.vcxproj.filters
+++ b/
project/libcec.vcxproj.filters
@@
-137,6
+137,11
@@
<ClInclude Include="..\src\lib\adapter\USBCECAdapterMessageQueue.h">
<Filter>adapter</Filter>
</ClInclude>
<ClInclude Include="..\src\lib\adapter\USBCECAdapterMessageQueue.h">
<Filter>adapter</Filter>
</ClInclude>
+ <ClInclude Include="..\src\lib\CECClient.h" />
+ <ClInclude Include="..\src\lib\CECInputBuffer.h" />
+ <ClInclude Include="..\src\lib\devices\CECDeviceMap.h">
+ <Filter>devices</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\lib\CECProcessor.cpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\lib\CECProcessor.cpp" />
@@
-197,6
+202,10
@@
<ClCompile Include="..\src\lib\adapter\USBCECAdapterMessageQueue.cpp">
<Filter>adapter</Filter>
</ClCompile>
<ClCompile Include="..\src\lib\adapter\USBCECAdapterMessageQueue.cpp">
<Filter>adapter</Filter>
</ClCompile>
+ <ClCompile Include="..\src\lib\CECClient.cpp" />
+ <ClCompile Include="..\src\lib\devices\CECDeviceMap.cpp">
+ <Filter>devices</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="libcec.rc" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="libcec.rc" />
diff --git
a/src/lib/CECClient.cpp
b/src/lib/CECClient.cpp
index 30723fe6dfb5bd71365454e27b9b6a51b0062537..9e69d0d7fef1527978ba341bf37ab2d654bf7ba1 100644
(file)
--- a/
src/lib/CECClient.cpp
+++ b/
src/lib/CECClient.cpp
@@
-870,7
+870,7
@@
bool CCECClient::SetConfiguration(const libcec_configuration *configuration)
else if (m_configuration.bActivateSource == 1 && bIsRunning && !m_processor->IsActiveSource(m_configuration.logicalAddresses.primary))
{
// activate the source if we're not already the active source
else if (m_configuration.bActivateSource == 1 && bIsRunning && !m_processor->IsActiveSource(m_configuration.logicalAddresses.primary))
{
// activate the source if we're not already the active source
-
m_processor->
SetActiveSource(m_configuration.deviceTypes.types[0]);
+
Send
SetActiveSource(m_configuration.deviceTypes.types[0]);
}
// persist the configuration
}
// persist the configuration
diff --git
a/src/lib/LibCEC.cpp
b/src/lib/LibCEC.cpp
index a204a4bc1a4f7cb0d9c40bf8a8950f70adf72000..1646041da0dd9759ee91f22674a587611d877d87 100644
(file)
--- a/
src/lib/LibCEC.cpp
+++ b/
src/lib/LibCEC.cpp
@@
-338,6
+338,9
@@
bool CLibCEC::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = t
cec_osd_name CLibCEC::GetDeviceOSDName(cec_logical_address iAddress)
{
cec_osd_name retVal;
cec_osd_name CLibCEC::GetDeviceOSDName(cec_logical_address iAddress)
{
cec_osd_name retVal;
+ retVal.device = CECDEVICE_UNKNOWN;
+ memset(retVal.name, 0, 14);
+
if (m_client)
retVal = m_client->GetDeviceOSDName(iAddress);
return retVal;
if (m_client)
retVal = m_client->GetDeviceOSDName(iAddress);
return retVal;
diff --git
a/src/lib/devices/CECDeviceMap.cpp
b/src/lib/devices/CECDeviceMap.cpp
index 558052732880d34d98d5fefd78d3066472cfa1c2..3c70603a541092ce56eadde795b899fbf3d84e75 100644
(file)
--- a/
src/lib/devices/CECDeviceMap.cpp
+++ b/
src/lib/devices/CECDeviceMap.cpp
@@
-36,7
+36,7
@@
#include "CECRecordingDevice.h"
#include "CECTuner.h"
#include "CECTV.h"
#include "CECRecordingDevice.h"
#include "CECTuner.h"
#include "CECTV.h"
-#include "CECProcessor.h"
+#include "
../
CECProcessor.h"
using namespace std;
using namespace CEC;
using namespace std;
using namespace CEC;
@@
-185,7
+185,7
@@
void CCECDeviceMap::GetPowerOffDevices(const libcec_configuration &configuration
{
for (CECDEVICEMAP::const_iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)
{
{
for (CECDEVICEMAP::const_iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)
{
- if (configuration.powerOffDevices[it->first])
+ if (configuration.powerOffDevices[
(uint8_t)
it->first])
devices.push_back(it->second);
}
}
devices.push_back(it->second);
}
}
@@
-194,7
+194,7
@@
void CCECDeviceMap::GetWakeDevices(const libcec_configuration &configuration, CE
{
for (CECDEVICEMAP::const_iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)
{
{
for (CECDEVICEMAP::const_iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)
{
- if (configuration.wakeDevices[it->first])
+ if (configuration.wakeDevices[
(uint8_t)
it->first])
devices.push_back(it->second);
}
}
devices.push_back(it->second);
}
}