Skip to content

Commit 87dfd6c

Browse files
committed
Create Alias for the conflicting CCEC lib calls
1 parent 9b76bf0 commit 87dfd6c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

HdmiCecSink/HdmiCecSinkImplementation.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
#include "UtilssyncPersistFile.h"
3939
#include "UtilsSearchRDKProfile.h"
4040

41+
using CCECRequestActiveSource = ::RequestActiveSource;
42+
using CCECSetMenuLanguage = ::SetMenuLanguage;
43+
using CCECRequestShortAudioDescriptor = ::RequestShortAudioDescriptor;
44+
4145
#define TEST_ADD 0
4246
#define HDMICECSINK_REQUEST_MAX_RETRY 3
4347
#define HDMICECSINK_REQUEST_MAX_WAIT_TIME_MS 2000
@@ -2039,7 +2043,7 @@ namespace WPEFramework
20392043

20402044

20412045
_instance->smConnection->sendTo(LogicalAddress::BROADCAST,
2042-
MessageEncoder().encode(CCEC::RequestActiveSource()), 500);
2046+
MessageEncoder().encode(CCECRequestActiveSource()), 500);
20432047
}
20442048

20452049
void HdmiCecSinkImplementation::setActiveSource(bool isResponse)
@@ -2103,7 +2107,7 @@ namespace WPEFramework
21032107

21042108
lang = _instance->deviceList[_instance->m_logicalAddressAllocated].m_currentLanguage;
21052109

2106-
_instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCEC::SetMenuLanguage(lang)), 100);
2110+
_instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCECSetMenuLanguage(lang)), 100);
21072111
}
21082112

21092113
void HdmiCecSinkImplementation::updateInActiveSource(const int logical_address, const InActiveSource &source )

HdmiCecSource/HdmiCecSourceImplementation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ namespace WPEFramework
10311031
LOGINFO("Command: sending GiveDevicePowerStatus \r\n");
10321032
smConnection->sendTo(LogicalAddress::TV, MessageEncoder().encode(GiveDevicePowerStatus()));
10331033
LOGINFO("Command: sending request active Source isDeviceActiveSource is set to false\r\n");
1034-
smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCEC::RequestActiveSource()));
1034+
smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(RequestActiveSource()));
10351035
isDeviceActiveSource = false;
10361036
LOGINFO("Command: GiveDeviceVendorID sending VendorID response :%s\n", \
10371037
(isLGTvConnected)?lgVendorId.toString().c_str():appVendorId.toString().c_str());

0 commit comments

Comments
 (0)