Skip to content

Commit 1de0da4

Browse files
smanes0213smanes0213
committed
Add new implementation changes
1 parent 9ba96ce commit 1de0da4

File tree

6 files changed

+20
-11
lines changed

6 files changed

+20
-11
lines changed

‎.github/workflows/L1-tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ jobs:
253253
ccec/MessageProcessor.hpp
254254
ccec/CECFrame.hpp
255255
ccec/MessageEncoder.hpp
256+
ccec/CCEC.hpp
256257
ccec/host/RDK.hpp
257258
rdk/ds/audioOutputPort.hpp
258259
rdk/ds/compositeIn.hpp

‎.github/workflows/L2-tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ jobs:
269269
ccec/MessageDecoder.hpp
270270
ccec/MessageProcessor.hpp
271271
ccec/CECFrame.hpp
272+
ccec/CCEC.hpp
272273
ccec/MessageEncoder.hpp
273274
ccec/host/RDK.hpp
274275
&&

‎HdmiCecSink/HdmiCecSinkImplementation.cpp‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "HdmiCecSinkImplementation.h"
2121

22+
#include "ccec/CCEC.hpp"
2223
#include "ccec/Connection.hpp"
2324
#include "ccec/CECFrame.hpp"
2425
#include "ccec/MessageEncoder.hpp"
@@ -37,6 +38,10 @@
3738
#include "UtilssyncPersistFile.h"
3839
#include "UtilsSearchRDKProfile.h"
3940

41+
using CCECRequestActiveSource = RequestActiveSource;
42+
using CCECSetMenuLanguage = SetMenuLanguage;
43+
using CCECRequestShortAudioDescriptor = RequestShortAudioDescriptor;
44+
4045
#define TEST_ADD 0
4146
#define HDMICECSINK_REQUEST_MAX_RETRY 3
4247
#define HDMICECSINK_REQUEST_MAX_WAIT_TIME_MS 2000
@@ -178,7 +183,7 @@ namespace WPEFramework
178183
HdmiCecSinkImplementation::_instance->addDevice(header.from.toInt());
179184
HdmiCecSinkImplementation::_instance->updateTextViewOn(header.from.toInt());
180185
}
181-
void HdmiCecSinkProcessor::process (const RequestActiveSourceMessage &msg, const Header &header)
186+
void HdmiCecSinkProcessor::process (const RequestActiveSource &msg, const Header &header)
182187
{
183188
printHeader(header);
184189
LOGINFO("Command: RequestActiveSource\n");
@@ -230,7 +235,7 @@ namespace WPEFramework
230235
if(!updateStatus)
231236
HdmiCecSinkImplementation::_instance->sendDeviceUpdateInfo(header.from.toInt());
232237
}
233-
void HdmiCecSinkProcessor::process (const SetMenuLanguageMessage &msg, const Header &header)
238+
void HdmiCecSinkProcessor::process (const SetMenuLanguage &msg, const Header &header)
234239
{
235240
printHeader(header);
236241
LOGINFO("Command: SetMenuLanguage Language : %s \n",msg.language.toString().c_str());
@@ -2039,7 +2044,7 @@ namespace WPEFramework
20392044

20402045

20412046
_instance->smConnection->sendTo(LogicalAddress::BROADCAST,
2042-
MessageEncoder().encode(RequestActiveSourceMessage()), 500);
2047+
MessageEncoder().encode(CCECRequestActiveSource()), 500);
20432048
}
20442049

20452050
void HdmiCecSinkImplementation::setActiveSource(bool isResponse)
@@ -2103,7 +2108,7 @@ namespace WPEFramework
21032108

21042109
lang = _instance->deviceList[_instance->m_logicalAddressAllocated].m_currentLanguage;
21052110

2106-
_instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(SetMenuLanguageMessage(lang)), 100);
2111+
_instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCECSetMenuLanguage(lang)), 100);
21072112
}
21082113

21092114
void HdmiCecSinkImplementation::updateInActiveSource(const int logical_address, const InActiveSource &source )
@@ -2202,7 +2207,7 @@ namespace WPEFramework
22022207
}
22032208

22042209
LOGINFO(" Send requestShortAudioDescriptor Message ");
2205-
_instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(RequestShortAudioDescriptorMessage(formatid,audioFormatCode,numberofdescriptor)), 1000);
2210+
_instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(CCECRequestShortAudioDescriptor(formatid,audioFormatCode,numberofdescriptor)), 1000);
22062211

22072212
}
22082213

‎HdmiCecSink/HdmiCecSinkImplementation.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ namespace WPEFramework {
6969
void process (const InActiveSource &msg, const Header &header);
7070
void process (const ImageViewOn &msg, const Header &header);
7171
void process (const TextViewOn &msg, const Header &header);
72-
void process (const RequestActiveSourceMessage &msg, const Header &header);
72+
void process (const RequestActiveSource &msg, const Header &header);
7373
void process (const Standby &msg, const Header &header);
7474
void process (const GetCECVersion &msg, const Header &header);
7575
void process (const CECVersion &msg, const Header &header);
76-
void process (const SetMenuLanguageMessage &msg, const Header &header);
76+
void process (const SetMenuLanguage &msg, const Header &header);
7777
void process (const GiveOSDName &msg, const Header &header);
7878
void process (const GivePhysicalAddress &msg, const Header &header);
7979
void process (const GiveDeviceVendorID &msg, const Header &header);

‎HdmiCecSource/HdmiCecSourceImplementation.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "HdmiCecSourceImplementation.h"
2121

22-
22+
#include "ccec/CCEC.hpp"
2323
#include "ccec/Connection.hpp"
2424
#include "ccec/CECFrame.hpp"
2525
#include "ccec/MessageEncoder.hpp"
@@ -36,6 +36,8 @@
3636
#include "UtilssyncPersistFile.h"
3737
#include "UtilsSearchRDKProfile.h"
3838

39+
using CCECRequestActiveSource = RequestActiveSource;
40+
3941
#define HDMICECSOURCE_METHOD_SET_ENABLED "SetEnabled"
4042
#define HDMICECSOURCE_METHOD_GET_ENABLED "GetEnabled"
4143
#define HDMICECSOURCE_METHOD_OTP_SET_ENABLED "SetOTPEnabled"
@@ -1031,7 +1033,7 @@ namespace WPEFramework
10311033
LOGINFO("Command: sending GiveDevicePowerStatus \r\n");
10321034
smConnection->sendTo(LogicalAddress::TV, MessageEncoder().encode(GiveDevicePowerStatus()));
10331035
LOGINFO("Command: sending request active Source isDeviceActiveSource is set to false\r\n");
1034-
smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(RequestActiveSourceMessage()));
1036+
smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCECRequestActiveSource()));
10351037
isDeviceActiveSource = false;
10361038
LOGINFO("Command: GiveDeviceVendorID sending VendorID response :%s\n", \
10371039
(isLGTvConnected)?lgVendorId.toString().c_str():appVendorId.toString().c_str());

‎HdmiCecSource/HdmiCecSourceImplementation.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ namespace WPEFramework {
6868
void process (const InActiveSource &msg, const Header &header);
6969
void process (const ImageViewOn &msg, const Header &header);
7070
void process (const TextViewOn &msg, const Header &header);
71-
void process (const RequestActiveSourceMessage &msg, const Header &header);
71+
void process (const RequestActiveSource &msg, const Header &header);
7272
void process (const Standby &msg, const Header &header);
7373
void process (const GetCECVersion &msg, const Header &header);
7474
void process (const CECVersion &msg, const Header &header);
75-
void process (const SetMenuLanguageMessage &msg, const Header &header);
75+
void process (const SetMenuLanguage &msg, const Header &header);
7676
void process (const GiveOSDName &msg, const Header &header);
7777
void process (const GivePhysicalAddress &msg, const Header &header);
7878
void process (const GiveDeviceVendorID &msg, const Header &header);

0 commit comments

Comments
 (0)