Skip to content

Commit 138302c

Browse files
smanes0213smanes0213
committed
Remove Message suffix from CEC process
1 parent 9b213aa commit 138302c

File tree

5 files changed

+118
-11
lines changed

5 files changed

+118
-11
lines changed

‎HdmiCecSink/HdmiCecSinkImplementation.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ namespace WPEFramework
177177
HdmiCecSinkImplementation::_instance->addDevice(header.from.toInt());
178178
HdmiCecSinkImplementation::_instance->updateTextViewOn(header.from.toInt());
179179
}
180-
void HdmiCecSinkProcessor::process (const RequestActiveSourceMessage &msg, const Header &header)
180+
void HdmiCecSinkProcessor::process (const RequestActiveSource &msg, const Header &header)
181181
{
182182
printHeader(header);
183183
LOGINFO("Command: RequestActiveSource\n");
@@ -229,7 +229,7 @@ namespace WPEFramework
229229
if(!updateStatus)
230230
HdmiCecSinkImplementation::_instance->sendDeviceUpdateInfo(header.from.toInt());
231231
}
232-
void HdmiCecSinkProcessor::process (const SetMenuLanguageMessage &msg, const Header &header)
232+
void HdmiCecSinkProcessor::process (const SetMenuLanguage &msg, const Header &header)
233233
{
234234
printHeader(header);
235235
LOGINFO("Command: SetMenuLanguage Language : %s \n",msg.language.toString().c_str());
@@ -2038,7 +2038,7 @@ namespace WPEFramework
20382038

20392039

20402040
_instance->smConnection->sendTo(LogicalAddress::BROADCAST,
2041-
MessageEncoder().encode(RequestActiveSourceMessage()), 500);
2041+
MessageEncoder().encode(RequestActiveSource()), 500);
20422042
}
20432043

20442044
void HdmiCecSinkImplementation::setActiveSource(bool isResponse)
@@ -2102,7 +2102,7 @@ namespace WPEFramework
21022102

21032103
lang = _instance->deviceList[_instance->m_logicalAddressAllocated].m_currentLanguage;
21042104

2105-
_instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(SetMenuLanguageMessage(lang)), 100);
2105+
_instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(SetMenuLanguage(lang)), 100);
21062106
}
21072107

21082108
void HdmiCecSinkImplementation::updateInActiveSource(const int logical_address, const InActiveSource &source )
@@ -2201,7 +2201,7 @@ namespace WPEFramework
22012201
}
22022202

22032203
LOGINFO(" Send requestShortAudioDescriptor Message ");
2204-
_instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(RequestShortAudioDescriptorMessage(formatid,audioFormatCode,numberofdescriptor)), 1000);
2204+
_instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(RequestShortAudioDescriptor(formatid,audioFormatCode,numberofdescriptor)), 1000);
22052205

22062206
}
22072207

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ namespace WPEFramework
135135
LOGINFO("Command: TextViewOn\n");
136136
HdmiCecSourceImplementation::_instance->addDevice(header.from.toInt());
137137
}
138-
void HdmiCecSourceProcessor::process (const RequestActiveSourceMessage &msg, const Header &header)
138+
void HdmiCecSourceProcessor::process (const RequestActiveSource &msg, const Header &header)
139139
{
140140
printHeader(header);
141141
LOGINFO("Command: RequestActiveSource\n");
@@ -178,7 +178,7 @@ namespace WPEFramework
178178
LOGINFO("Command: CECVersion Version : %s \n",msg.version.toString().c_str());
179179
HdmiCecSourceImplementation::_instance->addDevice(header.from.toInt());
180180
}
181-
void HdmiCecSourceProcessor::process (const SetMenuLanguageMessage &msg, const Header &header)
181+
void HdmiCecSourceProcessor::process (const SetMenuLanguage &msg, const Header &header)
182182
{
183183
printHeader(header);
184184
LOGINFO("Command: SetMenuLanguage Language : %s \n",msg.language.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);

‎newchanges.patch‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
diff --git a/HdmiCecSink/HdmiCecSinkImplementation.cpp b/HdmiCecSink/HdmiCecSinkImplementation.cpp
2+
index c44a7fd..4794dac 100644
3+
--- a/HdmiCecSink/HdmiCecSinkImplementation.cpp
4+
+++ b/HdmiCecSink/HdmiCecSinkImplementation.cpp
5+
@@ -178,7 +178,7 @@ namespace WPEFramework
6+
HdmiCecSinkImplementation::_instance->addDevice(header.from.toInt());
7+
HdmiCecSinkImplementation::_instance->updateTextViewOn(header.from.toInt());
8+
}
9+
- void HdmiCecSinkProcessor::process (const RequestActiveSourceMessage &msg, const Header &header)
10+
+ void HdmiCecSinkProcessor::process (const RequestActiveSource &msg, const Header &header)
11+
{
12+
printHeader(header);
13+
LOGINFO("Command: RequestActiveSource\n");
14+
@@ -230,7 +230,7 @@ namespace WPEFramework
15+
if(!updateStatus)
16+
HdmiCecSinkImplementation::_instance->sendDeviceUpdateInfo(header.from.toInt());
17+
}
18+
- void HdmiCecSinkProcessor::process (const SetMenuLanguageMessage &msg, const Header &header)
19+
+ void HdmiCecSinkProcessor::process (const SetMenuLanguage &msg, const Header &header)
20+
{
21+
printHeader(header);
22+
LOGINFO("Command: SetMenuLanguage Language : %s \n",msg.language.toString().c_str());
23+
@@ -2039,7 +2039,7 @@ namespace WPEFramework
24+
25+
26+
_instance->smConnection->sendTo(LogicalAddress::BROADCAST,
27+
- MessageEncoder().encode(RequestActiveSourceMessage()), 500);
28+
+ MessageEncoder().encode(RequestActiveSource()), 500);
29+
}
30+
31+
void HdmiCecSinkImplementation::setActiveSource(bool isResponse)
32+
@@ -2103,7 +2103,7 @@ namespace WPEFramework
33+
34+
lang = _instance->deviceList[_instance->m_logicalAddressAllocated].m_currentLanguage;
35+
36+
- _instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(SetMenuLanguageMessage(lang)), 100);
37+
+ _instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(SetMenuLanguage(lang)), 100);
38+
}
39+
40+
void HdmiCecSinkImplementation::updateInActiveSource(const int logical_address, const InActiveSource &source )
41+
@@ -2202,7 +2202,7 @@ namespace WPEFramework
42+
}
43+
44+
LOGINFO(" Send requestShortAudioDescriptor Message ");
45+
- _instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(RequestShortAudioDescriptorMessage(formatid,audioFormatCode,numberofdescriptor)), 1000);
46+
+ _instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(RequestShortAudioDescriptor(formatid,audioFormatCode,numberofdescriptor)), 1000);
47+
48+
}
49+
50+
diff --git a/HdmiCecSink/HdmiCecSinkImplementation.h b/HdmiCecSink/HdmiCecSinkImplementation.h
51+
index d28f199..45f926b 100644
52+
--- a/HdmiCecSink/HdmiCecSinkImplementation.h
53+
+++ b/HdmiCecSink/HdmiCecSinkImplementation.h
54+
@@ -69,11 +69,11 @@ namespace WPEFramework {
55+
void process (const InActiveSource &msg, const Header &header);
56+
void process (const ImageViewOn &msg, const Header &header);
57+
void process (const TextViewOn &msg, const Header &header);
58+
- void process (const RequestActiveSourceMessage &msg, const Header &header);
59+
+ void process (const RequestActiveSource &msg, const Header &header);
60+
void process (const Standby &msg, const Header &header);
61+
void process (const GetCECVersion &msg, const Header &header);
62+
void process (const CECVersion &msg, const Header &header);
63+
- void process (const SetMenuLanguageMessage &msg, const Header &header);
64+
+ void process (const SetMenuLanguage &msg, const Header &header);
65+
void process (const GiveOSDName &msg, const Header &header);
66+
void process (const GivePhysicalAddress &msg, const Header &header);
67+
void process (const GiveDeviceVendorID &msg, const Header &header);
68+
diff --git a/HdmiCecSource/HdmiCecSourceImplementation.cpp b/HdmiCecSource/HdmiCecSourceImplementation.cpp
69+
index cd6a2c4..2258bde 100644
70+
--- a/HdmiCecSource/HdmiCecSourceImplementation.cpp
71+
+++ b/HdmiCecSource/HdmiCecSourceImplementation.cpp
72+
@@ -135,7 +135,7 @@ namespace WPEFramework
73+
LOGINFO("Command: TextViewOn\n");
74+
HdmiCecSourceImplementation::_instance->addDevice(header.from.toInt());
75+
}
76+
- void HdmiCecSourceProcessor::process (const RequestActiveSourceMessage &msg, const Header &header)
77+
+ void HdmiCecSourceProcessor::process (const RequestActiveSource &msg, const Header &header)
78+
{
79+
printHeader(header);
80+
LOGINFO("Command: RequestActiveSource\n");
81+
@@ -178,7 +178,7 @@ namespace WPEFramework
82+
LOGINFO("Command: CECVersion Version : %s \n",msg.version.toString().c_str());
83+
HdmiCecSourceImplementation::_instance->addDevice(header.from.toInt());
84+
}
85+
- void HdmiCecSourceProcessor::process (const SetMenuLanguageMessage &msg, const Header &header)
86+
+ void HdmiCecSourceProcessor::process (const SetMenuLanguage &msg, const Header &header)
87+
{
88+
printHeader(header);
89+
LOGINFO("Command: SetMenuLanguage Language : %s \n",msg.language.toString().c_str());
90+
diff --git a/HdmiCecSource/HdmiCecSourceImplementation.h b/HdmiCecSource/HdmiCecSourceImplementation.h
91+
index e02a090..e6d1a5a 100644
92+
--- a/HdmiCecSource/HdmiCecSourceImplementation.h
93+
+++ b/HdmiCecSource/HdmiCecSourceImplementation.h
94+
@@ -68,11 +68,11 @@ namespace WPEFramework {
95+
void process (const InActiveSource &msg, const Header &header);
96+
void process (const ImageViewOn &msg, const Header &header);
97+
void process (const TextViewOn &msg, const Header &header);
98+
- void process (const RequestActiveSourceMessage &msg, const Header &header);
99+
+ void process (const RequestActiveSource &msg, const Header &header);
100+
void process (const Standby &msg, const Header &header);
101+
void process (const GetCECVersion &msg, const Header &header);
102+
void process (const CECVersion &msg, const Header &header);
103+
- void process (const SetMenuLanguageMessage &msg, const Header &header);
104+
+ void process (const SetMenuLanguage &msg, const Header &header);
105+
void process (const GiveOSDName &msg, const Header &header);
106+
void process (const GivePhysicalAddress &msg, const Header &header);
107+
void process (const GiveDeviceVendorID &msg, const Header &header);

0 commit comments

Comments
 (0)