cec: renamed GetOSDName() -> GetDeviceOSDName()

diff --git a/include/cec.h b/include/cec.h
index 98adaf9309b7bc9119122b9eaf2419230deeb95a..88381c4d54fc81bf816bbd77279f159e091d0fa9 100644 (file)
--- a/include/cec.h
+++ b/include/cec.h
@@ -327,7 +327,7 @@ namespace CEC
      * @param iAddress The device to get the OSD name for.
      * @return The OSD name.
      */
-    virtual cec_osd_name GetOSDName(cec_logical_address iAddress) = 0;
+    virtual cec_osd_name GetDeviceOSDName(cec_logical_address iAddress) = 0;
 
     /*!
      * @brief Get the logical address of the device that is currently the active source on the CEC bus.

diff --git a/include/cecc.h b/include/cecc.h
index f270df7737a53e80ed1e10c44a3f6588ab68cb2d..37bccc187b23aefc856d4dac18d4a32ad6b3cf61 100644 (file)
--- a/include/cecc.h
+++ b/include/cecc.h
@@ -246,9 +246,9 @@ extern DECLSPEC int cec_send_key_release(cec_logical_address iDestination, int b
 #endif
 
 #ifdef __cplusplus
-extern DECLSPEC CEC::cec_osd_name cec_get_osd_name(CEC::cec_logical_address iAddress);
+extern DECLSPEC CEC::cec_osd_name cec_get_device_osd_name(CEC::cec_logical_address iAddress);
 #else
-extern DECLSPEC cec_osd_name cec_get_osd_name(cec_logical_address iAddress);
+extern DECLSPEC cec_osd_name cec_get_device_osd_name(cec_logical_address iAddress);
 #endif
 
 extern DECLSPEC int cec_enable_physical_address_detection(void);

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 021b19a7cb7ba6ed1cc8751a250da9713d1938e5..673739a71d9e4ea1affcadabfa5058ad5b69dca9 100644 (file)
--- a/src/LibCecSharp/LibCecSharp.cpp
+++ b/src/LibCecSharp/LibCecSharp.cpp
@@ -676,9 +676,9 @@ public:
     return m_libCec->SendKeyRelease((cec_logical_address)destination, wait);
   }
 
-  String ^ GetOSDName(CecLogicalAddress logicalAddress)
+  String ^ GetDeviceOSDName(CecLogicalAddress logicalAddress)
   {
-    cec_osd_name osd = m_libCec->GetOSDName((cec_logical_address) logicalAddress);
+    cec_osd_name osd = m_libCec->GetDeviceOSDName((cec_logical_address) logicalAddress);
     return gcnew String(osd.name);
   }
 

diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index 4156954e0acce84bf49f1d969e9c7cc06f9b0faf..f43071c32025314bb0a0956805c25d2175edbce4 100644 (file)
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -314,7 +314,7 @@ bool CLibCEC::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = f
   return false;
 }
 
-cec_osd_name CLibCEC::GetOSDName(cec_logical_address iAddress)
+cec_osd_name CLibCEC::GetDeviceOSDName(cec_logical_address iAddress)
 {
   cec_osd_name retVal;
   retVal.device = iAddress;

diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h
index 02ea9c29a0f751eee1484b0c8ef46780bfd87fa0..c8917906cf8222a71118c74455afb29ee56e1f89 100644 (file)
--- a/src/lib/LibCEC.h
+++ b/src/lib/LibCEC.h
@@ -94,7 +94,7 @@ namespace CEC
       virtual uint8_t MuteAudio(bool bWait = true);
       virtual bool SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = false);
       virtual bool SendKeyRelease(cec_logical_address iDestination, bool bWait = false);
-      virtual cec_osd_name GetOSDName(cec_logical_address iAddress);
+      virtual cec_osd_name GetDeviceOSDName(cec_logical_address iAddress);
       virtual bool EnablePhysicalAddressDetection(void);
       virtual cec_logical_address GetActiveSource(void);
       virtual bool IsActiveSource(cec_logical_address iAddress);

diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp
index 28658cd2697636b4b4899f467ed36f62638f8e80..938e0b716daa571893ea52f45f96e17f7ca3f9cf 100644 (file)
--- a/src/lib/LibCECC.cpp
+++ b/src/lib/LibCECC.cpp
@@ -347,14 +347,14 @@ int cec_send_key_release(cec_logical_address iDestination, int bWait)
   return -1;
 }
 
-cec_osd_name cec_get_osd_name(cec_logical_address iAddress)
+cec_osd_name cec_get_device_osd_name(cec_logical_address iAddress)
 {
   cec_osd_name retVal;
   retVal.device = iAddress;
   retVal.name[0] = 0;
 
   if (cec_parser)
-    retVal = cec_parser->GetOSDName(iAddress);
+    retVal = cec_parser->GetDeviceOSDName(iAddress);
 
   return retVal;
 }

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index d1ca8c19616a3b43446f5a0494588affd9e1c0eb..f27fda9077e18276def1a6ac1bf729b9fc0808e8 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -593,7 +593,7 @@ bool ProcessCommandNAME(ICECAdapter *parser, const string &command, string &argu
       int iDev = atoi(strDev);
       if (iDev >= 0 && iDev < 15)
       {
-        cec_osd_name name = parser->GetOSDName((cec_logical_address)iDev);
+        cec_osd_name name = parser->GetDeviceOSDName((cec_logical_address)iDev);
         cout << "OSD name of device " << iDev << " is '" << name.name << "'" << endl;
       }
       return true;
@@ -725,7 +725,7 @@ bool ProcessCommandSCAN(ICECAdapter *parser, const string &command, string &argu
         uint16_t iPhysicalAddress = parser->GetDevicePhysicalAddress((cec_logical_address)iPtr);
         cec_version iCecVersion   = parser->GetDeviceCecVersion((cec_logical_address)iPtr);
         cec_power_status power    = parser->GetDevicePowerStatus((cec_logical_address)iPtr);
-        cec_osd_name osdName      = parser->GetOSDName((cec_logical_address)iPtr);
+        cec_osd_name osdName      = parser->GetDeviceOSDName((cec_logical_address)iPtr);
         CStdString strAddr;
         strAddr.Format("%04x", iPhysicalAddress);
         cec_menu_language lang;