From a50c9763562c1fc1126cab96f8eb26e8db32ca62 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@bucket.local>
Date: Fri, 8 Apr 2016 15:58:05 +0300
Subject: [PATCH] Updated API

---
 CallCapture/PatchCordProxy.cpp          | 10 +++++-----
 CallCapture/PatchCordProxy.h            |  4 ++--
 SVXLink/echolink/BrandMeisterBridge.cpp |  2 +-
 SVXLink/echolink/PatchCordProxy.cpp     | 10 +++++-----
 SVXLink/echolink/PatchCordProxy.h       |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CallCapture/PatchCordProxy.cpp b/CallCapture/PatchCordProxy.cpp
index 4fab5cf..ff70557 100644
--- a/CallCapture/PatchCordProxy.cpp
+++ b/CallCapture/PatchCordProxy.cpp
@@ -36,13 +36,13 @@ PatchCordProxy::~PatchCordProxy()
 void PatchCordProxy::setTalkerID(uint32_t value)
 {
   getContextBanner();
-  setVendorSpecificValue(VALUE_CORD_OUTGOING_SOURCE_ID, value);
+  setSpecificValue(VALUE_CORD_OUTGOING_SOURCE_ID, value);
 }
 
 uint32_t PatchCordProxy::getTalkerID()
 {
   getContextBanner();
-  return getVendorSpecificValue(VALUE_CORD_INCOMING_SOURCE_ID);
+  return getSpecificValue(VALUE_CORD_INCOMING_SOURCE_ID);
 }
 
 void PatchCordProxy::getContextBanner()
@@ -80,10 +80,10 @@ void PatchCordProxy::getContextBanner()
   dbus_message_unref(message);
 }
 
-void PatchCordProxy::setVendorSpecificValue(uint32_t key, uint32_t value)
+void PatchCordProxy::setSpecificValue(uint32_t key, uint32_t value)
 {
   DBusMessage* message = dbus_message_new_method_call(
-    name, OBJECT_PATH, INTERFACE_NAME, "setVendorSpecificValue");
+    name, OBJECT_PATH, INTERFACE_NAME, "setSpecificValue");
 
   dbus_message_append_args(message,
     DBUS_TYPE_STRING, &banner,
@@ -106,7 +106,7 @@ void PatchCordProxy::setVendorSpecificValue(uint32_t key, uint32_t value)
   banner = NULL;
 }
 
-uint32_t PatchCordProxy::getVendorSpecificValue(uint32_t key)
+uint32_t PatchCordProxy::getSpecificValue(uint32_t key)
 {
   DBusMessage* message = dbus_message_new_method_call(
     name, OBJECT_PATH, INTERFACE_NAME, "getContextData");
diff --git a/CallCapture/PatchCordProxy.h b/CallCapture/PatchCordProxy.h
index 836326c..8b8d398 100644
--- a/CallCapture/PatchCordProxy.h
+++ b/CallCapture/PatchCordProxy.h
@@ -25,8 +25,8 @@ class PatchCordProxy
     char* banner;
 
     void getContextBanner();
-    void setVendorSpecificValue(uint32_t key, uint32_t value);
-    uint32_t getVendorSpecificValue(uint32_t key);
+    void setSpecificValue(uint32_t key, uint32_t value);
+    uint32_t getSpecificValue(uint32_t key);
 
 };
 
diff --git a/SVXLink/echolink/BrandMeisterBridge.cpp b/SVXLink/echolink/BrandMeisterBridge.cpp
index 3957dfd..20e04e9 100644
--- a/SVXLink/echolink/BrandMeisterBridge.cpp
+++ b/SVXLink/echolink/BrandMeisterBridge.cpp
@@ -32,7 +32,7 @@ BrandMeisterBridge::~BrandMeisterBridge()
 void BrandMeisterBridge::setProxyConfiguration(const char* configuration)
 {
   char* pointer = const_cast<char*>(configuration);
-
+  // <Network ID>:<PatchCord ID>
   uint32_t network = strtol(pointer + 0, &pointer, 10);
   uint32_t link    = strtol(pointer + 1, &pointer, 10);
   proxy = new PatchCordProxy(network, link);
diff --git a/SVXLink/echolink/PatchCordProxy.cpp b/SVXLink/echolink/PatchCordProxy.cpp
index 4fab5cf..ff70557 100644
--- a/SVXLink/echolink/PatchCordProxy.cpp
+++ b/SVXLink/echolink/PatchCordProxy.cpp
@@ -36,13 +36,13 @@ PatchCordProxy::~PatchCordProxy()
 void PatchCordProxy::setTalkerID(uint32_t value)
 {
   getContextBanner();
-  setVendorSpecificValue(VALUE_CORD_OUTGOING_SOURCE_ID, value);
+  setSpecificValue(VALUE_CORD_OUTGOING_SOURCE_ID, value);
 }
 
 uint32_t PatchCordProxy::getTalkerID()
 {
   getContextBanner();
-  return getVendorSpecificValue(VALUE_CORD_INCOMING_SOURCE_ID);
+  return getSpecificValue(VALUE_CORD_INCOMING_SOURCE_ID);
 }
 
 void PatchCordProxy::getContextBanner()
@@ -80,10 +80,10 @@ void PatchCordProxy::getContextBanner()
   dbus_message_unref(message);
 }
 
-void PatchCordProxy::setVendorSpecificValue(uint32_t key, uint32_t value)
+void PatchCordProxy::setSpecificValue(uint32_t key, uint32_t value)
 {
   DBusMessage* message = dbus_message_new_method_call(
-    name, OBJECT_PATH, INTERFACE_NAME, "setVendorSpecificValue");
+    name, OBJECT_PATH, INTERFACE_NAME, "setSpecificValue");
 
   dbus_message_append_args(message,
     DBUS_TYPE_STRING, &banner,
@@ -106,7 +106,7 @@ void PatchCordProxy::setVendorSpecificValue(uint32_t key, uint32_t value)
   banner = NULL;
 }
 
-uint32_t PatchCordProxy::getVendorSpecificValue(uint32_t key)
+uint32_t PatchCordProxy::getSpecificValue(uint32_t key)
 {
   DBusMessage* message = dbus_message_new_method_call(
     name, OBJECT_PATH, INTERFACE_NAME, "getContextData");
diff --git a/SVXLink/echolink/PatchCordProxy.h b/SVXLink/echolink/PatchCordProxy.h
index 836326c..8b8d398 100644
--- a/SVXLink/echolink/PatchCordProxy.h
+++ b/SVXLink/echolink/PatchCordProxy.h
@@ -25,8 +25,8 @@ class PatchCordProxy
     char* banner;
 
     void getContextBanner();
-    void setVendorSpecificValue(uint32_t key, uint32_t value);
-    uint32_t getVendorSpecificValue(uint32_t key);
+    void setSpecificValue(uint32_t key, uint32_t value);
+    uint32_t getSpecificValue(uint32_t key);
 
 };