diff options
Diffstat (limited to 'PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h')
-rw-r--r-- | PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h index 0d19077..8145840 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.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. @@ -123,8 +123,8 @@ public: * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the domain. The other parameters of the domain * will be overwritten when the domain is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ virtual void peekDomain(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_domainID_t& domainID, am_Error_e& error); virtual void peekDomain(std::string name, am_domainID_t& domainID, am_Error_e& error); @@ -195,8 +195,8 @@ public: * registered with this name, it will return the corresponding ID, if not it will * reserve an ID but not register the source. The other parameters of the source * will be overwritten when the source is registered. - (at)return E_OK on - * success, E_UNKNOWN on error + (at)return E_OK on success, + * E_UNKNOWN on error */ virtual void peekSource(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_sourceID_t& sourceID, am_Error_e& error); virtual void peekSource(std::string name, am_sourceID_t& sourceID, am_Error_e& error); @@ -317,8 +317,8 @@ public: /** * updates data of an source. (at)return E_OK on success, E_NON_EXISTENT if the * sourceID in the struct is not valid. - Please note that only the following - * data out of am_Source_s have effect when they are + Please note that only the following data + * out of am_Source_s have effect when they are * changed: sourceClassID, listSoundProperties, @@ -374,8 +374,7 @@ protected: */ virtual bool trySetRoutingReadyAttribute(am_RoutingReady_e value); virtual bool validateRoutingReadyAttributeRequestedValue(const am_RoutingReady_e& value); -private: - class RemoteEventHandler: public RoutingControlObserverStubRemoteEvent { + class RemoteEventHandler: public virtual RoutingControlObserverStubRemoteEvent { public: RemoteEventHandler(RoutingControlObserverStubDefault* defaultStub); @@ -390,8 +389,8 @@ private: private: RoutingControlObserverStubDefault* defaultStub_; }; - - RemoteEventHandler remoteEventHandler_; +private: + RoutingControlObserverStubDefault::RemoteEventHandler remoteEventHandler_; /** * This attribute signals to the clients the current routing state. |