1 files changed, 12 insertions, 13 deletions

diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
index 2bfe6ba..7f58dbf 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.genivi.commonapi.core 2.1.6.v20140519.
 * Used org.franca.core 0.8.11.201401091023.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -72,11 +72,11 @@ public:
     /**
      * This function is used to increment or decrement the current volume for a
      *  sink.
-    (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if
-     *  the value is not in the given volume range.
+    (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the
+     *  value is not in the given volume range.
      */
-    virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error);
-    virtual void volumeStep(am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error);
+    virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volStep, am_Error_e& error);
+    virtual void volumeStep(am_sinkID_t sinkID, int16_t volStep, am_Error_e& error);
 
     /**
      * sets the mute state of a sink
@@ -132,8 +132,8 @@ public:
 
     /**
      * returns the actual list of Sources
-    (at)return E_OK on success,
-     *  E_DATABASE_ERROR on error
+    (at)return E_OK on success, E_DATABASE_ERROR
+     *  on error
      */
     virtual void getListMainSources(const std::shared_ptr<CommonAPI::ClientId> clientId, am_SourceType_L& listMainSources, am_Error_e& error);
     virtual void getListMainSources(am_SourceType_L& listMainSources, am_Error_e& error);
@@ -141,8 +141,8 @@ public:
     /**
      * This is used to retrieve all source sound properties related to a source.
      *  Returns a vector of the sound properties and values as pair
-    (at)return E_OK
-     *  on success, E_DATABASE_ERROR on error
+    (at)return E_OK on
+     *  success, E_DATABASE_ERROR on error
      */
     virtual void getListMainSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error);
     virtual void getListMainSinkSoundProperties(am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error);
@@ -316,8 +316,7 @@ public:
 
 
 protected:
-private:
-    class RemoteEventHandler: public CommandControlStubRemoteEvent {
+    class RemoteEventHandler: public virtual CommandControlStubRemoteEvent {
      public:
         RemoteEventHandler(CommandControlStubDefault* defaultStub);
 
@@ -325,8 +324,8 @@ private:
      private:
         CommandControlStubDefault* defaultStub_;
     };
-
-    RemoteEventHandler remoteEventHandler_;
+private:
+    CommandControlStubDefault::RemoteEventHandler remoteEventHandler_;
 
 
     CommonAPI::Version interfaceVersion_;