repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: get the vendor id of the TV before allocating logical addresses, so we can deter...
[deb_libcec.git]
/
src
/
lib
/
CECProcessor.cpp
diff --git
a/src/lib/CECProcessor.cpp
b/src/lib/CECProcessor.cpp
index 7c2e08a0ac537ef7c3dca64513058c15c5698f47..034c7e660c56de66d1702781d5f636b3716a71fe 100644
(file)
--- a/
src/lib/CECProcessor.cpp
+++ b/
src/lib/CECProcessor.cpp
@@
-42,15
+42,18
@@
#include "implementations/CECCommandHandler.h"
#include "LibCEC.h"
#include "CECClient.h"
#include "implementations/CECCommandHandler.h"
#include "LibCEC.h"
#include "CECClient.h"
+#include "CECTypeUtils.h"
#include "platform/util/timeutils.h"
#include "platform/util/timeutils.h"
+#include "platform/util/util.h"
using namespace CEC;
using namespace std;
using namespace PLATFORM;
#define CEC_PROCESSOR_SIGNAL_WAIT_TIME 1000
using namespace CEC;
using namespace std;
using namespace PLATFORM;
#define CEC_PROCESSOR_SIGNAL_WAIT_TIME 1000
+#define ACTIVE_SOURCE_CHECK_TIMEOUT 10000
-#define ToString(x)
m_libcec->
ToString(x)
+#define ToString(x)
CCECTypeUtils::
ToString(x)
CCECProcessor::CCECProcessor(CLibCEC *libcec) :
m_bInitialised(false),
CCECProcessor::CCECProcessor(CLibCEC *libcec) :
m_bInitialised(false),
@@
-66,7
+69,7
@@
CCECProcessor::CCECProcessor(CLibCEC *libcec) :
CCECProcessor::~CCECProcessor(void)
{
Close();
CCECProcessor::~CCECProcessor(void)
{
Close();
-
delete m_busDevices
;
+
DELETE_AND_NULL(m_busDevices)
;
}
bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = CEC_SERIAL_DEFAULT_BAUDRATE */, uint32_t iTimeoutMs /* = CEC_DEFAULT_CONNECT_TIMEOUT */)
}
bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = CEC_SERIAL_DEFAULT_BAUDRATE */, uint32_t iTimeoutMs /* = CEC_DEFAULT_CONNECT_TIMEOUT */)
@@
-86,9
+89,6
@@
bool CCECProcessor::Start(const char *strPort, uint16_t iBaudRate /* = CEC_SERIA
}
}
}
}
- // mark as initialised
- SetCECInitialised(true);
-
return true;
}
return true;
}
@@
-101,21
+101,13
@@
void CCECProcessor::Close(void)
StopThread();
// close the connection
StopThread();
// close the connection
- if (m_communication)
- {
- delete m_communication;
- m_communication = NULL;
- }
+ DELETE_AND_NULL(m_communication);
}
void CCECProcessor::ResetMembers(void)
{
// close the connection
}
void CCECProcessor::ResetMembers(void)
{
// close the connection
- if (m_communication)
- {
- delete m_communication;
- m_communication = NULL;
- }
+ DELETE_AND_NULL(m_communication);
// reset the other members to the initial state
m_iStandardLineTimeout = 3;
// reset the other members to the initial state
m_iStandardLineTimeout = 3;
@@
-156,6
+148,9
@@
bool CCECProcessor::OpenConnection(const char *strPort, uint16_t iBaudRate, uint
m_libcec->AddLog(CEC_LOG_NOTICE, "connection opened");
m_libcec->AddLog(CEC_LOG_NOTICE, "connection opened");
+ // mark as initialised
+ SetCECInitialised(true);
+
return bReturn;
}
return bReturn;
}
@@
-203,6
+198,19
@@
void CCECProcessor::ReplaceHandlers(void)
it->second->ReplaceHandler(true);
}
it->second->ReplaceHandler(true);
}
+void CCECProcessor::CheckPendingActiveSource(void)
+{
+ if (!CECInitialised())
+ return;
+
+ // check each device
+ for (CECDEVICEMAP::iterator it = m_busDevices->Begin(); it != m_busDevices->End(); it++)
+ {
+ if (it->second->GetHandler()->ActiveSourcePending())
+ it->second->ActivateSource();
+ }
+}
+
bool CCECProcessor::OnCommandReceived(const cec_command &command)
{
return m_inBuffer.Push(command);
bool CCECProcessor::OnCommandReceived(const cec_command &command)
{
return m_inBuffer.Push(command);
@@
-213,6
+221,7
@@
void *CCECProcessor::Process(void)
m_libcec->AddLog(CEC_LOG_DEBUG, "processor thread started");
cec_command command;
m_libcec->AddLog(CEC_LOG_DEBUG, "processor thread started");
cec_command command;
+ CTimeout activeSourceCheck(ACTIVE_SOURCE_CHECK_TIMEOUT);
// as long as we're not being stopped and the connection is open
while (!IsStopped() && m_communication->IsOpen())
// as long as we're not being stopped and the connection is open
while (!IsStopped() && m_communication->IsOpen())
@@
-228,6
+237,13
@@
void *CCECProcessor::Process(void)
// check if we need to replace handlers
ReplaceHandlers();
// check if we need to replace handlers
ReplaceHandlers();
+
+ // check whether we need to activate a source, if it failed before
+ if (activeSourceCheck.TimeLeft() == 0)
+ {
+ CheckPendingActiveSource();
+ activeSourceCheck.Init(ACTIVE_SOURCE_CHECK_TIMEOUT);
+ }
}
}
}
}
@@
-514,7
+530,7
@@
bool CCECProcessor::StartBootloader(const char *strPort /* = NULL */)
if (comm->IsOpen())
{
bReturn = comm->StartBootloader();
if (comm->IsOpen())
{
bReturn = comm->StartBootloader();
-
delete comm
;
+
DELETE_AND_NULL(comm)
;
}
return bReturn;
}
}
return bReturn;
}
@@
-615,15
+631,28
@@
CCECTuner *CCECProcessor::GetTuner(cec_logical_address address) const
bool CCECProcessor::RegisterClient(CCECClient *client)
{
bool CCECProcessor::RegisterClient(CCECClient *client)
{
- if (!client || !IsRunning())
+ if (!client)
+ return false;
+
+ libcec_configuration &configuration = *client->GetConfiguration();
+
+ if (configuration.clientVersion >= CEC_CLIENT_VERSION_1_6_3 && configuration.bMonitorOnly == 1)
+ return true;
+
+ if (!CECInitialised())
+ {
+ m_libcec->AddLog(CEC_LOG_ERROR, "failed to register a new CEC client: CEC processor is not initialised");
return false;
return false;
+ }
+
+ // ensure that we know the vendor id of the TV
+ GetTV()->GetVendorId(CECDEVICE_UNREGISTERED);
// unregister the client first if it's already been marked as registered
if (client->IsRegistered())
UnregisterClient(client);
// get the configuration from the client
// unregister the client first if it's already been marked as registered
if (client->IsRegistered())
UnregisterClient(client);
// get the configuration from the client
- libcec_configuration &configuration = *client->GetConfiguration();
m_libcec->AddLog(CEC_LOG_NOTICE, "registering new CEC client - v%s", ToString((cec_client_version)configuration.clientVersion));
// mark as uninitialised and unregistered
m_libcec->AddLog(CEC_LOG_NOTICE, "registering new CEC client - v%s", ToString((cec_client_version)configuration.clientVersion));
// mark as uninitialised and unregistered
@@
-694,6
+723,14
@@
bool CCECProcessor::RegisterClient(CCECClient *client)
client->Alert(CEC_ALERT_SERVICE_DEVICE, param);
}
client->Alert(CEC_ALERT_SERVICE_DEVICE, param);
}
+ // ensure that the command handler for the TV is initialised
+ if (bReturn)
+ {
+ CCECCommandHandler *handler = GetTV()->GetHandler();
+ if (handler)
+ handler->InitHandler();
+ }
+
return bReturn;
}
return bReturn;
}