diff options
Diffstat (limited to 'PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h')
| -rw-r--r-- | PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h index 656d3f7..5e98b7b 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.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. @@ -329,8 +329,8 @@ 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. * * Calls volumeStep with synchronous semantics. * @@ -340,7 +340,7 @@ public: * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. */ - virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error); + virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error); /** * Calls volumeStep with asynchronous semantics. * @@ -351,7 +351,7 @@ public: * The std::future returned by this method will be fulfilled at arrival of the reply. * It will provide the same value for CallStatus as will be handed to the callback. */ - virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback); + virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback); /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. @@ -506,8 +506,8 @@ public: virtual std::future<CommonAPI::CallStatus> getListMainSinksAsync(GetListMainSinksAsyncCallback callback); /** * 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 * * Calls getListMainSources with synchronous semantics. * @@ -531,8 +531,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 * * Calls getListMainSinkSoundProperties with synchronous semantics. * @@ -825,14 +825,20 @@ public: std::shared_ptr<CommandControlProxyBase> delegate_; }; +#ifdef WIN32 + typedef CommandControlProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> CommandControlProxyDefault; +#else + typedef CommandControlProxy<> CommandControlProxyDefault; +#endif + // // CommandControlProxy Implementation // template <typename ... _AttributeExtensions> CommandControlProxy<_AttributeExtensions...>::CommandControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate): - delegate_(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)), - _AttributeExtensions(*(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)))... { + _AttributeExtensions(*(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)))..., + delegate_(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)) { } template <typename ... _AttributeExtensions> @@ -884,17 +890,17 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>: /** * 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. */ template <typename ... _AttributeExtensions> -void CommandControlProxy<_AttributeExtensions...>::volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error) { - delegate_->volumeStep(sinkID, volumeStep_, callStatus, error); +void CommandControlProxy<_AttributeExtensions...>::volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error) { + delegate_->volumeStep(sinkID, volStep, callStatus, error); } template <typename ... _AttributeExtensions> -std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback) { - return delegate_->volumeStepAsync(sinkID, volumeStep_, callback); +std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback) { + return delegate_->volumeStepAsync(sinkID, volStep, callback); } /** * sets the mute state of a sink @@ -986,8 +992,8 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>: } /** * 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 */ template <typename ... _AttributeExtensions> void CommandControlProxy<_AttributeExtensions...>::getListMainSources(CommonAPI::CallStatus& callStatus, am_SourceType_L& listMainSources, am_Error_e& error) { @@ -1001,8 +1007,8 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>: /** * 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 */ template <typename ... _AttributeExtensions> void CommandControlProxy<_AttributeExtensions...>::getListMainSinkSoundProperties(const am_sinkID_t& sinkID, CommonAPI::CallStatus& callStatus, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) { |