Skip to content

Commit 9b76bf0

Browse files
committed
Update CCEC namespace
1 parent a11f608 commit 9b76bf0

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

HdmiCecSink/HdmiCecSinkImplementation.cpp

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

41-
// Type aliases to resolve conflicts between CCEC message classes and implementation methods
42-
// CCEC classes are in global namespace when CCEC_NAMESPACE is not defined in headers
43-
using CCECRequestActiveSource = RequestActiveSource;
44-
using CCECSetMenuLanguage = SetMenuLanguage;
45-
using CCECRequestShortAudioDescriptor = RequestShortAudioDescriptor;
46-
4741
#define TEST_ADD 0
4842
#define HDMICECSINK_REQUEST_MAX_RETRY 3
4943
#define HDMICECSINK_REQUEST_MAX_WAIT_TIME_MS 2000
@@ -2045,7 +2039,7 @@ namespace WPEFramework
20452039

20462040

20472041
_instance->smConnection->sendTo(LogicalAddress::BROADCAST,
2048-
MessageEncoder().encode(CCECRequestActiveSource()), 500);
2042+
MessageEncoder().encode(CCEC::RequestActiveSource()), 500);
20492043
}
20502044

20512045
void HdmiCecSinkImplementation::setActiveSource(bool isResponse)
@@ -2109,7 +2103,7 @@ namespace WPEFramework
21092103

21102104
lang = _instance->deviceList[_instance->m_logicalAddressAllocated].m_currentLanguage;
21112105

2112-
_instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCECSetMenuLanguage(lang)), 100);
2106+
_instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCEC::SetMenuLanguage(lang)), 100);
21132107
}
21142108

21152109
void HdmiCecSinkImplementation::updateInActiveSource(const int logical_address, const InActiveSource &source )
@@ -2208,7 +2202,7 @@ namespace WPEFramework
22082202
}
22092203

22102204
LOGINFO(" Send requestShortAudioDescriptor Message ");
2211-
_instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(CCECRequestShortAudioDescriptor(formatid,audioFormatCode,numberofdescriptor)), 1000);
2205+
_instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(CCEC::RequestShortAudioDescriptor(formatid,audioFormatCode,numberofdescriptor)), 1000);
22122206

22132207
}
22142208

HdmiCecSource/HdmiCecSourceImplementation.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
#include "UtilssyncPersistFile.h"
3737
#include "UtilsSearchRDKProfile.h"
3838

39-
// Type alias to resolve conflict between CCEC message class and implementation method
40-
// CCEC classes are in global namespace when CCEC_NAMESPACE is not defined in headers
41-
using CCECRequestActiveSource = RequestActiveSource;
42-
4339
#define HDMICECSOURCE_METHOD_SET_ENABLED "SetEnabled"
4440
#define HDMICECSOURCE_METHOD_GET_ENABLED "GetEnabled"
4541
#define HDMICECSOURCE_METHOD_OTP_SET_ENABLED "SetOTPEnabled"
@@ -1035,7 +1031,7 @@ namespace WPEFramework
10351031
LOGINFO("Command: sending GiveDevicePowerStatus \r\n");
10361032
smConnection->sendTo(LogicalAddress::TV, MessageEncoder().encode(GiveDevicePowerStatus()));
10371033
LOGINFO("Command: sending request active Source isDeviceActiveSource is set to false\r\n");
1038-
smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCECRequestActiveSource()));
1034+
smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCEC::RequestActiveSource()));
10391035
isDeviceActiveSource = false;
10401036
LOGINFO("Command: GiveDeviceVendorID sending VendorID response :%s\n", \
10411037
(isLGTvConnected)?lgVendorId.toString().c_str():appVendorId.toString().c_str());

0 commit comments

Comments
 (0)