|
38 | 38 | #include "UtilssyncPersistFile.h"
|
39 | 39 | #include "UtilsSearchRDKProfile.h"
|
40 | 40 |
|
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 |
| - |
47 | 41 | #define TEST_ADD 0
|
48 | 42 | #define HDMICECSINK_REQUEST_MAX_RETRY 3
|
49 | 43 | #define HDMICECSINK_REQUEST_MAX_WAIT_TIME_MS 2000
|
@@ -2045,7 +2039,7 @@ namespace WPEFramework
|
2045 | 2039 |
|
2046 | 2040 |
|
2047 | 2041 | _instance->smConnection->sendTo(LogicalAddress::BROADCAST,
|
2048 |
| - MessageEncoder().encode(CCECRequestActiveSource()), 500); |
| 2042 | + MessageEncoder().encode(CCEC::RequestActiveSource()), 500); |
2049 | 2043 | }
|
2050 | 2044 |
|
2051 | 2045 | void HdmiCecSinkImplementation::setActiveSource(bool isResponse)
|
@@ -2109,7 +2103,7 @@ namespace WPEFramework
|
2109 | 2103 |
|
2110 | 2104 | lang = _instance->deviceList[_instance->m_logicalAddressAllocated].m_currentLanguage;
|
2111 | 2105 |
|
2112 |
| - _instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCECSetMenuLanguage(lang)), 100); |
| 2106 | + _instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCEC::SetMenuLanguage(lang)), 100); |
2113 | 2107 | }
|
2114 | 2108 |
|
2115 | 2109 | void HdmiCecSinkImplementation::updateInActiveSource(const int logical_address, const InActiveSource &source )
|
@@ -2208,7 +2202,7 @@ namespace WPEFramework
|
2208 | 2202 | }
|
2209 | 2203 |
|
2210 | 2204 | 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); |
2212 | 2206 |
|
2213 | 2207 | }
|
2214 | 2208 |
|
|
0 commit comments