repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3154de8
)
cec: remove m_writeMutex in CCECBusDevice
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Fri, 23 Dec 2011 01:01:29 +0000
(
02:01
+0100)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Fri, 23 Dec 2011 01:01:29 +0000
(
02:01
+0100)
src/lib/devices/CECAudioSystem.cpp
patch
|
blob
|
blame
|
history
src/lib/devices/CECBusDevice.cpp
patch
|
blob
|
blame
|
history
src/lib/devices/CECBusDevice.h
patch
|
blob
|
blame
|
history
src/lib/devices/CECPlaybackDevice.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/lib/devices/CECAudioSystem.cpp
b/src/lib/devices/CECAudioSystem.cpp
index 5b227233c732db91f93aff89b9ea997e94e43390..87b45057d3060d9d2475158d73682f1df6baa167 100644
(file)
--- a/
src/lib/devices/CECAudioSystem.cpp
+++ b/
src/lib/devices/CECAudioSystem.cpp
@@
-48,7
+48,7
@@
CCECAudioSystem::CCECAudioSystem(CCECProcessor *processor, cec_logical_address a
bool CCECAudioSystem::SetAudioStatus(uint8_t status)
{
bool CCECAudioSystem::SetAudioStatus(uint8_t status)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_audioStatus != status)
{
CStdString strLog;
if (m_audioStatus != status)
{
CStdString strLog;
@@
-64,7
+64,7
@@
bool CCECAudioSystem::SetAudioStatus(uint8_t status)
bool CCECAudioSystem::SetSystemAudioModeStatus(const cec_system_audio_status mode)
{
bool CCECAudioSystem::SetSystemAudioModeStatus(const cec_system_audio_status mode)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_systemAudioStatus != mode)
{
CStdString strLog;
if (m_systemAudioStatus != mode)
{
CStdString strLog;
@@
-82,7
+82,7
@@
bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest)
{
uint8_t state;
{
{
uint8_t state;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
CStdString strLog;
strLog.Format("<< %x -> %x: audio status '%2x'", m_iLogicalAddress, dest, m_audioStatus);
AddLog(CEC_LOG_NOTICE, strLog);
CStdString strLog;
strLog.Format("<< %x -> %x: audio status '%2x'", m_iLogicalAddress, dest, m_audioStatus);
AddLog(CEC_LOG_NOTICE, strLog);
@@
-96,7
+96,7
@@
bool CCECAudioSystem::TransmitSetSystemAudioMode(cec_logical_address dest)
{
cec_system_audio_status state;
{
{
cec_system_audio_status state;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
CStdString strLog;
strLog.Format("<< %x -> %x: set system audio mode '%2x'", m_iLogicalAddress, dest, m_audioStatus);
AddLog(CEC_LOG_NOTICE, strLog);
CStdString strLog;
strLog.Format("<< %x -> %x: set system audio mode '%2x'", m_iLogicalAddress, dest, m_audioStatus);
AddLog(CEC_LOG_NOTICE, strLog);
@@
-110,7
+110,7
@@
bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest)
{
cec_system_audio_status state;
{
{
cec_system_audio_status state;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
CStdString strLog;
strLog.Format("<< %x -> %x: system audio mode '%s'", m_iLogicalAddress, dest, ToString(m_systemAudioStatus));
AddLog(CEC_LOG_NOTICE, strLog);
CStdString strLog;
strLog.Format("<< %x -> %x: system audio mode '%s'", m_iLogicalAddress, dest, ToString(m_systemAudioStatus));
AddLog(CEC_LOG_NOTICE, strLog);
diff --git
a/src/lib/devices/CECBusDevice.cpp
b/src/lib/devices/CECBusDevice.cpp
index 1f612c4b551601fa38deaa2b85509951d0e7188a..6279de948712b051e1dd4d2d7eaffa61a2a72380 100644
(file)
--- a/
src/lib/devices/CECBusDevice.cpp
+++ b/
src/lib/devices/CECBusDevice.cpp
@@
-82,7
+82,7
@@
bool CCECBusDevice::HandleCommand(const cec_command &command)
/* update "last active" */
{
/* update "last active" */
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
m_iLastActive = GetTimeMs();
if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC)
m_iLastActive = GetTimeMs();
if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC)
@@
-95,7
+95,7
@@
bool CCECBusDevice::HandleCommand(const cec_command &command)
/* change status to present */
if (bHandled)
{
/* change status to present */
if (bHandled)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC)
{
if (m_deviceStatus != CEC_DEVICE_STATUS_PRESENT)
if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC)
{
if (m_deviceStatus != CEC_DEVICE_STATUS_PRESENT)
@@
-372,7
+372,7
@@
bool CCECBusDevice::NeedsPoll(void)
cec_bus_device_status CCECBusDevice::GetStatus(bool bForcePoll /* = false */)
{
cec_bus_device_status CCECBusDevice::GetStatus(bool bForcePoll /* = false */)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC &&
(m_deviceStatus == CEC_DEVICE_STATUS_UNKNOWN || bForcePoll))
{
if (m_deviceStatus != CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC &&
(m_deviceStatus == CEC_DEVICE_STATUS_UNKNOWN || bForcePoll))
{
@@
-403,7
+403,7
@@
void CCECBusDevice::SetCecVersion(const cec_version newVersion)
void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language)
{
void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (language.device == m_iLogicalAddress)
{
CStdString strLog;
if (language.device == m_iLogicalAddress)
{
CStdString strLog;
@@
-415,7
+415,7
@@
void CCECBusDevice::SetMenuLanguage(const cec_menu_language &language)
void CCECBusDevice::SetOSDName(CStdString strName)
{
void CCECBusDevice::SetOSDName(CStdString strName)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_strDeviceName != strName)
{
CStdString strLog;
if (m_strDeviceName != strName)
{
CStdString strLog;
@@
-427,7
+427,7
@@
void CCECBusDevice::SetOSDName(CStdString strName)
void CCECBusDevice::SetMenuState(const cec_menu_state state)
{
void CCECBusDevice::SetMenuState(const cec_menu_state state)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_menuState != state)
{
CStdString strLog;
if (m_menuState != state)
{
CStdString strLog;
@@
-440,7
+440,7
@@
void CCECBusDevice::SetMenuState(const cec_menu_state state)
void CCECBusDevice::SetInactiveSource(void)
{
{
void CCECBusDevice::SetInactiveSource(void)
{
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
m_bActiveSource = false;
}
m_bActiveSource = false;
}
@@
-450,7
+450,7
@@
void CCECBusDevice::SetInactiveSource(void)
void CCECBusDevice::SetActiveSource(void)
{
void CCECBusDevice::SetActiveSource(void)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
for (int iPtr = 0; iPtr < 16; iPtr++)
if (iPtr != m_iLogicalAddress)
for (int iPtr = 0; iPtr < 16; iPtr++)
if (iPtr != m_iLogicalAddress)
@@
-484,7
+484,7
@@
bool CCECBusDevice::TryLogicalAddress(void)
void CCECBusDevice::SetDeviceStatus(const cec_bus_device_status newStatus)
{
void CCECBusDevice::SetDeviceStatus(const cec_bus_device_status newStatus)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
switch (newStatus)
{
case CEC_DEVICE_STATUS_UNKNOWN:
switch (newStatus)
{
case CEC_DEVICE_STATUS_UNKNOWN:
@@
-516,7
+516,7
@@
void CCECBusDevice::SetDeviceStatus(const cec_bus_device_status newStatus)
void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress)
{
void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (iNewAddress > 0 && m_iPhysicalAddress != iNewAddress)
{
CStdString strLog;
if (iNewAddress > 0 && m_iPhysicalAddress != iNewAddress)
{
CStdString strLog;
@@
-529,7
+529,7
@@
void CCECBusDevice::SetPhysicalAddress(uint16_t iNewAddress)
void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
{
void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /* = 0 */)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (iNewAddress > 0)
{
CStdString strLog;
if (iNewAddress > 0)
{
CStdString strLog;
@@
-548,7
+548,7
@@
void CCECBusDevice::SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress /*
void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
{
void CCECBusDevice::SetPowerStatus(const cec_power_status powerStatus)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_powerStatus != powerStatus)
{
CStdString strLog;
if (m_powerStatus != powerStatus)
{
CStdString strLog;
@@
-563,7
+563,7
@@
bool CCECBusDevice::SetVendorId(uint64_t iVendorId, bool bInitHandler /* = true
bool bVendorChanged(false);
{
bool bVendorChanged(false);
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
bVendorChanged = (m_vendor != (cec_vendor_id)iVendorId);
m_vendor = (cec_vendor_id)iVendorId;
bVendorChanged = (m_vendor != (cec_vendor_id)iVendorId);
m_vendor = (cec_vendor_id)iVendorId;
@@
-609,7
+609,7
@@
bool CCECBusDevice::TransmitActiveSource(void)
bool bSendActiveSource(false);
{
bool bSendActiveSource(false);
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_powerStatus != CEC_POWER_STATUS_ON)
{
CStdString strLog;
if (m_powerStatus != CEC_POWER_STATUS_ON)
{
CStdString strLog;
@@
-638,7
+638,7
@@
bool CCECBusDevice::TransmitCECVersion(cec_logical_address dest)
{
cec_version version;
{
{
cec_version version;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): cec version %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_cecVersion));
AddLog(CEC_LOG_NOTICE, strLog);
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): cec version %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_cecVersion));
AddLog(CEC_LOG_NOTICE, strLog);
@@
-652,7
+652,7
@@
bool CCECBusDevice::TransmitInactiveSource(void)
{
uint16_t iPhysicalAddress;
{
{
uint16_t iPhysicalAddress;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
CStdString strLog;
strLog.Format("<< %s (%X) -> broadcast (F): inactive source", GetLogicalAddressName(), m_iLogicalAddress);
AddLog(CEC_LOG_NOTICE, strLog);
CStdString strLog;
strLog.Format("<< %s (%X) -> broadcast (F): inactive source", GetLogicalAddressName(), m_iLogicalAddress);
AddLog(CEC_LOG_NOTICE, strLog);
@@
-666,7
+666,7
@@
bool CCECBusDevice::TransmitMenuState(cec_logical_address dest)
{
cec_menu_state menuState;
{
{
cec_menu_state menuState;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): menu state '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_menuState));
AddLog(CEC_LOG_NOTICE, strLog);
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): menu state '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_menuState));
AddLog(CEC_LOG_NOTICE, strLog);
@@
-680,7
+680,7
@@
bool CCECBusDevice::TransmitOSDName(cec_logical_address dest)
{
CStdString strDeviceName;
{
{
CStdString strDeviceName;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): OSD name '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, m_strDeviceName.c_str());
AddLog(CEC_LOG_NOTICE, strLog.c_str());
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): OSD name '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, m_strDeviceName.c_str());
AddLog(CEC_LOG_NOTICE, strLog.c_str());
@@
-708,7
+708,7
@@
bool CCECBusDevice::TransmitPhysicalAddress(void)
uint16_t iPhysicalAddress;
cec_device_type type;
{
uint16_t iPhysicalAddress;
cec_device_type type;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_iPhysicalAddress == 0xffff)
return false;
if (m_iPhysicalAddress == 0xffff)
return false;
@@
-739,7
+739,7
@@
bool CCECBusDevice::TransmitPoll(cec_logical_address dest)
bReturn = m_handler->TransmitPoll(m_iLogicalAddress, dest);
AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
bReturn = m_handler->TransmitPoll(m_iLogicalAddress, dest);
AddLog(CEC_LOG_DEBUG, bReturn ? ">> POLL sent" : ">> POLL not sent");
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (bReturn)
{
m_iLastActive = GetTimeMs();
if (bReturn)
{
m_iLastActive = GetTimeMs();
@@
-755,7
+755,7
@@
bool CCECBusDevice::TransmitPowerState(cec_logical_address dest)
{
cec_power_status state;
{
{
cec_power_status state;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_powerStatus));
AddLog(CEC_LOG_NOTICE, strLog.c_str());
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_powerStatus));
AddLog(CEC_LOG_NOTICE, strLog.c_str());
@@
-769,7
+769,7
@@
bool CCECBusDevice::TransmitVendorID(cec_logical_address dest, bool bSendAbort /
{
uint64_t iVendorId;
{
{
uint64_t iVendorId;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
iVendorId = (uint64_t)m_vendor;
}
iVendorId = (uint64_t)m_vendor;
}
diff --git
a/src/lib/devices/CECBusDevice.h
b/src/lib/devices/CECBusDevice.h
index c25966359a03e78b39e3e347a3fad3852f742f56..0ca662afe471a6c5117321cfc909c3513e725500 100644
(file)
--- a/
src/lib/devices/CECBusDevice.h
+++ b/
src/lib/devices/CECBusDevice.h
@@
-130,7
+130,6
@@
namespace CEC
cec_version m_cecVersion;
cec_bus_device_status m_deviceStatus;
std::set<cec_opcode> m_unsupportedFeatures;
cec_version m_cecVersion;
cec_bus_device_status m_deviceStatus;
std::set<cec_opcode> m_unsupportedFeatures;
- CMutex m_writeMutex;
CMutex m_mutex;
};
};
CMutex m_mutex;
};
};
diff --git
a/src/lib/devices/CECPlaybackDevice.cpp
b/src/lib/devices/CECPlaybackDevice.cpp
index 4c90b9fa470c734e7e617aad2cf97363b6693300..4969de58c4af45bc442a0953016c3638d1014a1d 100644
(file)
--- a/
src/lib/devices/CECPlaybackDevice.cpp
+++ b/
src/lib/devices/CECPlaybackDevice.cpp
@@
-54,7
+54,7
@@
cec_deck_info CCECPlaybackDevice::GetDeckStatus(void)
void CCECPlaybackDevice::SetDeckStatus(cec_deck_info deckStatus)
{
void CCECPlaybackDevice::SetDeckStatus(cec_deck_info deckStatus)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_deckStatus != deckStatus && m_deckStatus != CEC_DECK_INFO_OTHER_STATUS_LG)
{
CStdString strLog;
if (m_deckStatus != deckStatus && m_deckStatus != CEC_DECK_INFO_OTHER_STATUS_LG)
{
CStdString strLog;
@@
-73,7
+73,7
@@
cec_deck_control_mode CCECPlaybackDevice::GetDeckControlMode(void)
void CCECPlaybackDevice::SetDeckControlMode(cec_deck_control_mode mode)
{
void CCECPlaybackDevice::SetDeckControlMode(cec_deck_control_mode mode)
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
if (m_deckControlMode != mode)
{
CStdString strLog;
if (m_deckControlMode != mode)
{
CStdString strLog;
@@
-88,7
+88,7
@@
bool CCECPlaybackDevice::TransmitDeckStatus(cec_logical_address dest)
{
cec_deck_info state;
{
{
cec_deck_info state;
{
- CLockObject lock(&m_
writeM
utex);
+ CLockObject lock(&m_
m
utex);
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): deck status '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_deckStatus));
AddLog(CEC_LOG_NOTICE, strLog);
CStdString strLog;
strLog.Format("<< %s (%X) -> %s (%X): deck status '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_deckStatus));
AddLog(CEC_LOG_NOTICE, strLog);