From f71a1df9ac5b73127eb05aa0abe6063a05b0271d Mon Sep 17 00:00:00 2001
From: Lars Op den Kamp <lars.opdenkamp@pulse-eight.com>
Date: Thu, 8 Dec 2011 00:20:05 +0100
Subject: [PATCH] cec: renamed GetOSDName() -> GetDeviceOSDName()

---
 include/cec.h                   | 2 +-
 include/cecc.h                  | 4 ++--
 src/LibCecSharp/LibCecSharp.cpp | 4 ++--
 src/lib/LibCEC.cpp              | 2 +-
 src/lib/LibCEC.h                | 2 +-
 src/lib/LibCECC.cpp             | 4 ++--
 src/testclient/main.cpp         | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/cec.h b/include/cec.h
index 98adaf9..88381c4 100644
--- 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 f270df7..37bccc1 100644
--- 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 021b19a..673739a 100644
--- 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 4156954..f43071c 100644
--- 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 02ea9c2..c891790 100644
--- 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 28658cd..938e0b7 100644
--- 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 d1ca8c1..f27fda9 100644
--- 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;
-- 
2.34.1