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

diff --git a/include/cectypes.h b/include/cectypes.h
index 3e4c85390978f71c36f7b6d7aaddd18bd97eb523..f561d84748692ebf7116562f0a8d3357fece687a 100644 (file)
--- 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 33fda207195284fd12be2178daf39baab0eed683..1bcba1893e60b728db5329a0d55e06e222c54d78 100644 (file)
--- 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 b06ef1dffc886f9194eef2fe3047e2aa4aa35b46..24243ff6b493c81380abbb6b4a0169efc685dc6e 100644 (file)
--- 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);