From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 15 Nov 2011 23:37:39 +0000 (+0100)
Subject: cec: rename cec_type_list::Add() and Clear() back to lower case or we'll break XBMC... 
X-Git-Tag: upstream/2.2.0~1^2~44^2~129
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=20b8870a99c4e141387dbf538a02c5b3527d8dc7;p=deb_libcec.git

cec: rename cec_type_list::Add() and Clear() back to lower case or we'll break XBMC compat
---

diff --git a/include/cectypes.h b/include/cectypes.h
index 3e4c853..f561d84 100644
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -738,13 +738,13 @@ typedef struct cec_device_type_list
   cec_device_type types[5];
 
 #ifdef __cplusplus
-  void Clear(void)
+  void clear(void)
   {
     for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
      types[iPtr] = CEC_DEVICE_TYPE_RESERVED;
   }
 
-  void Add(const cec_device_type type)
+  void add(const cec_device_type type)
   {
     for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
     {
diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 33fda20..1bcba18 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -56,7 +56,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm
 {
   m_logicalAddresses.Clear();
   m_logicalAddresses.Set(iLogicalAddress);
-  m_types.Clear();
+  m_types.clear();
   for (int iPtr = 0; iPtr <= 16; iPtr++)
     m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, iPtr == iLogicalAddress ? iPhysicalAddress : 0);
 }
diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index b06ef1d..24243ff 100644
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -271,7 +271,7 @@ int main (int argc, char *argv[])
 {
   int iPhysicalAddress = -1;
   cec_device_type_list typeList;
-  typeList.Clear();
+  typeList.clear();
 
   int iArgPtr = 1;
   bool bSingleCommand(false);
@@ -329,25 +329,25 @@ int main (int argc, char *argv[])
           {
             if (!bSingleCommand)
               cout << "== using device type 'playback device'" << endl;
-            typeList.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+            typeList.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
           }
           else if (!strcmp(argv[iArgPtr + 1], "r"))
           {
             if (!bSingleCommand)
               cout << "== using device type 'recording device'" << endl;
-            typeList.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+            typeList.add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
           }
           else if (!strcmp(argv[iArgPtr + 1], "t"))
           {
             if (!bSingleCommand)
               cout << "== using device type 'tuner'" << endl;
-            typeList.Add(CEC_DEVICE_TYPE_TUNER);
+            typeList.add(CEC_DEVICE_TYPE_TUNER);
           }
           else if (!strcmp(argv[iArgPtr + 1], "a"))
           {
             if (!bSingleCommand)
               cout << "== using device type 'audio system'" << endl;
-            typeList.Add(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
+            typeList.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
           }
           else
           {
@@ -404,7 +404,7 @@ int main (int argc, char *argv[])
   {
     if (!bSingleCommand)
       cout << "No device type given. Using 'playback device'" << endl;
-    typeList.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+    typeList.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
   }
 
   ICECAdapter *parser = LibCecInit("CECTester", typeList);