Adding CCEC Namespace

Author: smanes0213

HdmiCecSink/HdmiCecSinkImplementation.cpp

@@ -17,7 +17,6 @@
 * limitations under the License.
 **/
 
-#define CCEC_NAMESPACE  // Enable CCEC namespace
 #include "HdmiCecSinkImplementation.h"
 
 #include "ccec/CCEC.hpp"
@@ -39,6 +38,12 @@
 #include "UtilssyncPersistFile.h"
 #include "UtilsSearchRDKProfile.h"
 
+// Type aliases to resolve conflicts between CCEC message classes and implementation methods
+// CCEC classes are in global namespace when CCEC_NAMESPACE is not defined in headers
+using CCECRequestActiveSource = RequestActiveSource;
+using CCECSetMenuLanguage = SetMenuLanguage;
+using CCECRequestShortAudioDescriptor = RequestShortAudioDescriptor;
+
 #define TEST_ADD 0
 #define HDMICECSINK_REQUEST_MAX_RETRY                 3
 #define HDMICECSINK_REQUEST_MAX_WAIT_TIME_MS         2000
@@ -2040,7 +2045,7 @@ namespace WPEFramework
 
 
             _instance->smConnection->sendTo(LogicalAddress::BROADCAST, 
-                                        MessageEncoder().encode(CCEC::RequestActiveSource()), 500);
+                                        MessageEncoder().encode(CCECRequestActiveSource()), 500);
         }
 
         void HdmiCecSinkImplementation::setActiveSource(bool isResponse)
@@ -2104,7 +2109,7 @@ namespace WPEFramework
 
             lang = _instance->deviceList[_instance->m_logicalAddressAllocated].m_currentLanguage;
 
-            _instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCEC::SetMenuLanguage(lang)), 100);
+            _instance->smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCECSetMenuLanguage(lang)), 100);
         }
 
         void HdmiCecSinkImplementation::updateInActiveSource(const int logical_address, const InActiveSource &source )
@@ -2203,7 +2208,7 @@ namespace WPEFramework
             }
 
                         LOGINFO(" Send requestShortAudioDescriptor Message ");
-                    _instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(CCEC::RequestShortAudioDescriptor(formatid,audioFormatCode,numberofdescriptor)), 1000);
+                    _instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(CCECRequestShortAudioDescriptor(formatid,audioFormatCode,numberofdescriptor)), 1000);
 
         }
 

HdmiCecSource/HdmiCecSourceImplementation.cpp

@@ -17,7 +17,6 @@
 * limitations under the License.
 **/
 
-#define CCEC_NAMESPACE  // Enable CCEC namespace
 #include "HdmiCecSourceImplementation.h"
 
 #include "ccec/CCEC.hpp"
@@ -37,6 +36,10 @@
 #include "UtilssyncPersistFile.h"
 #include "UtilsSearchRDKProfile.h"
 
+// Type alias to resolve conflict between CCEC message class and implementation method
+// CCEC classes are in global namespace when CCEC_NAMESPACE is not defined in headers
+using CCECRequestActiveSource = RequestActiveSource;
+
 #define HDMICECSOURCE_METHOD_SET_ENABLED "SetEnabled"
 #define HDMICECSOURCE_METHOD_GET_ENABLED "GetEnabled"
 #define HDMICECSOURCE_METHOD_OTP_SET_ENABLED "SetOTPEnabled"
@@ -1032,7 +1035,7 @@ namespace WPEFramework
                 LOGINFO("Command: sending GiveDevicePowerStatus \r\n");
                 smConnection->sendTo(LogicalAddress::TV, MessageEncoder().encode(GiveDevicePowerStatus()));
                 LOGINFO("Command: sending request active Source isDeviceActiveSource is set to false\r\n");
-                smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCEC::RequestActiveSource()));
+                smConnection->sendTo(LogicalAddress::BROADCAST, MessageEncoder().encode(CCECRequestActiveSource()));
                 isDeviceActiveSource = false;
                 LOGINFO("Command: GiveDeviceVendorID sending VendorID response :%s\n", \
                                                  (isLGTvConnected)?lgVendorId.toString().c_str():appVendorId.toString().c_str());