diff options
Diffstat (limited to 'PluginRoutingInterfaceCAPI/src-gen')
22 files changed, 999 insertions, 374 deletions
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp index 161a7b7..7170981 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp @@ -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. diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h index 8996092..ce9ea60 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.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. @@ -714,15 +714,15 @@ namespace am { am_NotificationStatus_e status; /** * This gives additional information to the notification status. - Relation - * between notification status and the value: - NS_PERIODIC - the period in - * ms - NS_MINIMUM - the minimum value that triggers the notification - NS_MAXIMUM - * - the maximum value that triggers the notifcation - NS_CHANGE - the resolution - * of the change value + Relation between + * notification status and the value: + NS_PERIODIC - the period in ms + NS_MINIMUM + * - the minimum value that triggers the notification + NS_MAXIMUM - the maximum + * value that triggers the notifcation + NS_CHANGE - the resolution of the change + * value */ int16_t parameter; @@ -1155,8 +1155,8 @@ namespace am { /** * This enum can have 3 states: - HS_SINKA sinkA is the current hot one, - * sinkB is not audible + HS_SINKA sinkA is the current hot one, sinkB + * is not audible HS_SINKB sinkB is the current hot one, sinkB is not * audible HS_INTERMEDIATE the fader is stuck in between a cross-fading @@ -1571,11 +1571,11 @@ namespace am { * tuner that is not actively heard. The source state is set by the * AudioManagerController.There are 3 possible states: - SS_ON: the source - * is active + SS_ON: the source is + * active SS_OFF: the source is off - SS_PAUSED: the source is paused - * and not active. + SS_PAUSED: the source is paused and + * not active. */ am_SourceState_e sourceState; /** @@ -2076,7 +2076,7 @@ static inline const char* getTypeCollectionName() { } inline CommonAPI::Version getTypeCollectionVersion() { - return CommonAPI::Version(1, 0); + return CommonAPI::Version(2, 0); } } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h index 5cb6ccb..779347b 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.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. @@ -43,7 +43,7 @@ const char* RoutingControl::getInterfaceId() { } CommonAPI::Version RoutingControl::getInterfaceVersion() { - return CommonAPI::Version(1, 0); + return CommonAPI::Version(2, 0); } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp index e32836f..2cf9ecd 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp @@ -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. @@ -27,7 +27,7 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createRoutingControlDBusProxy( return std::make_shared<RoutingControlDBusProxy>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } -__attribute__((constructor)) void registerRoutingControlDBusProxy(void) { +INITIALIZER(registerRoutingControlDBusProxy) { CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(RoutingControl::getInterfaceId(), &createRoutingControlDBusProxy); } @@ -72,7 +72,7 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncAbortAsync(cons /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ void RoutingControlDBusProxy::asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>, @@ -197,8 +197,8 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceStateA } /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ void RoutingControlDBusProxy::asyncSetSinkSoundProperties(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, CommonAPI::CallStatus& callStatus) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_SoundProperty_L>, @@ -221,8 +221,8 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSinkSoundPro } /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ void RoutingControlDBusProxy::asyncSetSinkSoundProperty(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, CommonAPI::CallStatus& callStatus) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_SoundProperty_s>, @@ -400,7 +400,7 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceNotifi void RoutingControlDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { - ownVersionMajor = 1; + ownVersionMajor = 2; ownVersionMinor = 0; } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h index f9036d4..68fc160 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.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. @@ -55,7 +55,7 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus); virtual std::future<CommonAPI::CallStatus> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, AsyncConnectAsyncCallback callback); @@ -95,15 +95,15 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p virtual std::future<CommonAPI::CallStatus> asyncSetSourceStateAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_SourceState_e& state, AsyncSetSourceStateAsyncCallback callback); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperties(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, CommonAPI::CallStatus& callStatus); virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertiesAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, AsyncSetSinkSoundPropertiesAsyncCallback callback); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperty(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, CommonAPI::CallStatus& callStatus); virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertyAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, AsyncSetSinkSoundPropertyAsyncCallback callback); diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp index 8563781..b6529b8 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp @@ -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. @@ -25,7 +25,7 @@ std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createRoutingControlDBusStubAd return std::make_shared<RoutingControlDBusStubAdapter>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); } -__attribute__((constructor)) void registerRoutingControlDBusStubAdapter(void) { +INITIALIZER(registerRoutingControlDBusStubAdapter) { CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(RoutingControl::getInterfaceId(), &createRoutingControlDBusStubAdapter); } @@ -38,6 +38,7 @@ RoutingControlDBusStubAdapterInternal::~RoutingControlDBusStubAdapterInternal() } void RoutingControlDBusStubAdapterInternal::deactivateManagedInstances() { + } const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { @@ -56,7 +57,7 @@ const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ "<method name=\"asyncConnect\">\n" "<arg name=\"handle\" type=\"(iq)\" direction=\"in\" />\n" @@ -116,8 +117,8 @@ const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm "</method>\n" /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ "<method name=\"asyncSetSinkSoundProperties\">\n" "<arg name=\"handle\" type=\"(iq)\" direction=\"in\" />\n" @@ -126,8 +127,8 @@ const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm "</method>\n" /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ "<method name=\"asyncSetSinkSoundProperty\">\n" "<arg name=\"handle\" type=\"(iq)\" direction=\"in\" />\n" @@ -195,10 +196,11 @@ const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm return introspectionData.c_str(); } -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< RoutingControlStub, CommonAPI::Version - > getRoutingControlInterfaceVersionStubDispatcher(&RoutingControlStub::getInterfaceVersion, "uu"); + > RoutingControlDBusStubAdapterInternal::getRoutingControlInterfaceVersionStubDispatcher(&RoutingControlStub::getInterfaceVersion, "uu"); + /** @@ -206,31 +208,31 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< (at)return E_OK on success, E_UNKNOWN on error, * E_NON_EXISTENT if handle was not found */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s>, std::tuple<> - > asyncAbortStubDispatcher(&RoutingControlStub::asyncAbort, ""); + > RoutingControlDBusStubAdapterInternal::asyncAbortStubDispatcher(&RoutingControlStub::asyncAbort, ""); /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>, std::tuple<> - > asyncConnectStubDispatcher(&RoutingControlStub::asyncConnect, ""); + > RoutingControlDBusStubAdapterInternal::asyncConnectStubDispatcher(&RoutingControlStub::asyncConnect, ""); /** * disconnect a connection with given connectionID (at)return E_OK on success, * E_UNKNOWN on error, E_NON_EXISTENT if connection was not found */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_connectionID_t>, std::tuple<> - > asyncDisconnectStubDispatcher(&RoutingControlStub::asyncDisconnect, ""); + > RoutingControlDBusStubAdapterInternal::asyncDisconnectStubDispatcher(&RoutingControlStub::asyncDisconnect, ""); /** * this method is used to set the volume of a sink. This function is used to drive * ramps, to mute or unmute or directly set the value. The difference is made @@ -238,11 +240,11 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< (at)return E_OK on success, E_UNKNOWN on error, * E_OUT_OF_RANGE if new volume is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>, std::tuple<> - > asyncSetSinkVolumeStubDispatcher(&RoutingControlStub::asyncSetSinkVolume, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSinkVolumeStubDispatcher(&RoutingControlStub::asyncSetSinkVolume, ""); /** * sets the volume of a source. This method is used to set the volume of a sink. * This function is used to drive ramps, to mute or unmute or directly set the @@ -252,96 +254,98 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< * range. triggers the acknowledge ackSourceVolumeChange */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>, std::tuple<> - > asyncSetSourceVolumeStubDispatcher(&RoutingControlStub::asyncSetSourceVolume, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceVolumeStubDispatcher(&RoutingControlStub::asyncSetSourceVolume, ""); /** * This function is used to set the source state of a particular * source. (at)return E_OK on success, E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_SourceState_e>, std::tuple<> - > asyncSetSourceStateStubDispatcher(&RoutingControlStub::asyncSetSourceState, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceStateStubDispatcher(&RoutingControlStub::asyncSetSourceState, ""); /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sinkID_t, am_SoundProperty_L>, std::tuple<> - > asyncSetSinkSoundPropertiesStubDispatcher(&RoutingControlStub::asyncSetSinkSoundProperties, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSinkSoundPropertiesStubDispatcher(&RoutingControlStub::asyncSetSinkSoundProperties, ""); /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sinkID_t, am_SoundProperty_s>, std::tuple<> - > asyncSetSinkSoundPropertyStubDispatcher(&RoutingControlStub::asyncSetSinkSoundProperty, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSinkSoundPropertyStubDispatcher(&RoutingControlStub::asyncSetSinkSoundProperty, ""); /** * this function sets the sourcesoundproperty. (at)return E_OK on success, * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_SoundProperty_L>, std::tuple<> - > asyncSetSourceSoundPropertiesStubDispatcher(&RoutingControlStub::asyncSetSourceSoundProperties, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceSoundPropertiesStubDispatcher(&RoutingControlStub::asyncSetSourceSoundProperties, ""); /** * this function sets the sourcesoundproperty. (at)return E_OK on success, * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_SoundProperty_s>, std::tuple<> - > asyncSetSourceSoundPropertyStubDispatcher(&RoutingControlStub::asyncSetSourceSoundProperty, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceSoundPropertyStubDispatcher(&RoutingControlStub::asyncSetSourceSoundProperty, ""); /** * this function triggers crossfading. (at)return E_OK on success, E_UNKNOWN on * error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>, std::tuple<> - > asyncCrossFadeStubDispatcher(&RoutingControlStub::asyncCrossFade, ""); + > RoutingControlDBusStubAdapterInternal::asyncCrossFadeStubDispatcher(&RoutingControlStub::asyncCrossFade, ""); /** * this function is used for early and late audio functions to set the domain * state (at)return E_OK on success, E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_domainID_t, am_DomainState_e>, std::tuple<am_Error_e> - > setDomainStateStubDispatcher(&RoutingControlStub::setDomainState, "i"); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > RoutingControlDBusStubAdapterInternal::setDomainStateStubDispatcher(&RoutingControlStub::setDomainState, "i"); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_Volumes_L>, std::tuple<> - > asyncSetVolumesStubDispatcher(&RoutingControlStub::asyncSetVolumes, ""); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > RoutingControlDBusStubAdapterInternal::asyncSetVolumesStubDispatcher(&RoutingControlStub::asyncSetVolumes, ""); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sinkID_t, am_NotificationConfiguration_s>, std::tuple<> - > asyncSetSinkNotificationConfigurationStubDispatcher(&RoutingControlStub::asyncSetSinkNotificationConfiguration, ""); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > RoutingControlDBusStubAdapterInternal::asyncSetSinkNotificationConfigurationStubDispatcher(&RoutingControlStub::asyncSetSinkNotificationConfiguration, ""); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, std::tuple<am_Handle_s, am_sourceID_t, am_NotificationConfiguration_s>, std::tuple<> - > asyncSetSourceNotificationConfigurationStubDispatcher(&RoutingControlStub::asyncSetSourceNotificationConfiguration, ""); + > RoutingControlDBusStubAdapterInternal::asyncSetSourceNotificationConfigurationStubDispatcher(&RoutingControlStub::asyncSetSourceNotificationConfiguration, ""); + + @@ -349,6 +353,9 @@ const RoutingControlDBusStubAdapterHelper::StubDispatcherTable& RoutingControlDB return stubDispatcherTable_; } +const CommonAPI::DBus::StubAttributeTable& RoutingControlDBusStubAdapterInternal::getStubAttributeTable() { + return stubAttributeTable_; +} RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -381,19 +388,19 @@ RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal( (at)return E_OK on success, E_UNKNOWN on error, * E_NON_EXISTENT if handle was not found */ - { { "asyncAbort", "(iq)" }, &org::genivi::am::asyncAbortStubDispatcher }, + { { "asyncAbort", "(iq)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncAbortStubDispatcher }, /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ - { { "asyncConnect", "(iq)qqqq" }, &org::genivi::am::asyncConnectStubDispatcher }, + { { "asyncConnect", "(iq)qqqq" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncConnectStubDispatcher }, /** * disconnect a connection with given connectionID (at)return E_OK on success, * E_UNKNOWN on error, E_NON_EXISTENT if connection was not found */ - { { "asyncDisconnect", "(iq)q" }, &org::genivi::am::asyncDisconnectStubDispatcher }, + { { "asyncDisconnect", "(iq)q" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncDisconnectStubDispatcher }, /** * this method is used to set the volume of a sink. This function is used to drive * ramps, to mute or unmute or directly set the value. The difference is made @@ -401,7 +408,7 @@ RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal( (at)return E_OK on success, E_UNKNOWN on error, * E_OUT_OF_RANGE if new volume is out of range */ - { { "asyncSetSinkVolume", "(iq)qnqn" }, &org::genivi::am::asyncSetSinkVolumeStubDispatcher }, + { { "asyncSetSinkVolume", "(iq)qnqn" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSinkVolumeStubDispatcher }, /** * sets the volume of a source. This method is used to set the volume of a sink. * This function is used to drive ramps, to mute or unmute or directly set the @@ -411,55 +418,60 @@ RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal( * range. triggers the acknowledge ackSourceVolumeChange */ - { { "asyncSetSourceVolume", "(iq)qnqn" }, &org::genivi::am::asyncSetSourceVolumeStubDispatcher }, + { { "asyncSetSourceVolume", "(iq)qnqn" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceVolumeStubDispatcher }, /** * This function is used to set the source state of a particular * source. (at)return E_OK on success, E_UNKNOWN on error */ - { { "asyncSetSourceState", "(iq)qi" }, &org::genivi::am::asyncSetSourceStateStubDispatcher }, + { { "asyncSetSourceState", "(iq)qi" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceStateStubDispatcher }, /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ - { { "asyncSetSinkSoundProperties", "(iq)qa(qn)" }, &org::genivi::am::asyncSetSinkSoundPropertiesStubDispatcher }, + { { "asyncSetSinkSoundProperties", "(iq)qa(qn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSinkSoundPropertiesStubDispatcher }, /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ - { { "asyncSetSinkSoundProperty", "(iq)q(qn)" }, &org::genivi::am::asyncSetSinkSoundPropertyStubDispatcher }, + { { "asyncSetSinkSoundProperty", "(iq)q(qn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSinkSoundPropertyStubDispatcher }, /** * this function sets the sourcesoundproperty. (at)return E_OK on success, * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range */ - { { "asyncSetSourceSoundProperties", "(iq)qa(qn)" }, &org::genivi::am::asyncSetSourceSoundPropertiesStubDispatcher }, + { { "asyncSetSourceSoundProperties", "(iq)qa(qn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceSoundPropertiesStubDispatcher }, /** * this function sets the sourcesoundproperty. (at)return E_OK on success, * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range */ - { { "asyncSetSourceSoundProperty", "(iq)q(qn)" }, &org::genivi::am::asyncSetSourceSoundPropertyStubDispatcher }, + { { "asyncSetSourceSoundProperty", "(iq)q(qn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceSoundPropertyStubDispatcher }, /** * this function triggers crossfading. (at)return E_OK on success, E_UNKNOWN on * error */ - { { "asyncCrossFade", "(iq)qiqn" }, &org::genivi::am::asyncCrossFadeStubDispatcher }, + { { "asyncCrossFade", "(iq)qiqn" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncCrossFadeStubDispatcher }, /** * this function is used for early and late audio functions to set the domain * state (at)return E_OK on success, E_UNKNOWN on error */ - { { "setDomainState", "qi" }, &org::genivi::am::setDomainStateStubDispatcher }, - { { "asyncSetVolumes", "(iq)a(i(yv)nqn)" }, &org::genivi::am::asyncSetVolumesStubDispatcher }, - { { "asyncSetSinkNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::asyncSetSinkNotificationConfigurationStubDispatcher }, - { { "asyncSetSourceNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::asyncSetSourceNotificationConfigurationStubDispatcher } - }) { + { { "setDomainState", "qi" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::setDomainStateStubDispatcher }, + { { "asyncSetVolumes", "(iq)a(i(yv)nqn)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetVolumesStubDispatcher }, + { { "asyncSetSinkNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSinkNotificationConfigurationStubDispatcher }, + { { "asyncSetSourceNotificationConfiguration", "(iq)q(qin)" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::asyncSetSourceNotificationConfigurationStubDispatcher } + }), + stubAttributeTable_() { + + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::RoutingControlDBusStubAdapterInternal::getRoutingControlInterfaceVersionStubDispatcher }); +} - stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getRoutingControlInterfaceVersionStubDispatcher }); +const bool RoutingControlDBusStubAdapterInternal::hasFreedesktopProperties() { + return false; } } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h index 5f73bcb..77b93fe 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.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. @@ -33,7 +33,7 @@ namespace am { typedef CommonAPI::DBus::DBusStubAdapterHelper<RoutingControlStub> RoutingControlDBusStubAdapterHelper; -class RoutingControlDBusStubAdapterInternal: public RoutingControlStubAdapter, public RoutingControlDBusStubAdapterHelper { +class RoutingControlDBusStubAdapterInternal: public virtual RoutingControlStubAdapter, public RoutingControlDBusStubAdapterHelper { public: RoutingControlDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -46,19 +46,175 @@ class RoutingControlDBusStubAdapterInternal: public RoutingControlStubAdapter, p ~RoutingControlDBusStubAdapterInternal(); + virtual const bool hasFreedesktopProperties(); + const RoutingControlDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable(); void deactivateManagedInstances(); +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + RoutingControlStub, + CommonAPI::Version + > getRoutingControlInterfaceVersionStubDispatcher; + + + +/** + * aborts an asynchronous action. +(at)return E_OK on success, E_UNKNOWN on error, + * E_NON_EXISTENT if handle was not found + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s>, + std::tuple<> + > asyncAbortStubDispatcher; +/** + * connects a source to a sink +(at)return E_OK on success, E_UNKNOWN on error, + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>, + std::tuple<> + > asyncConnectStubDispatcher; +/** + * disconnect a connection with given connectionID +(at)return E_OK on success, + * E_UNKNOWN on error, E_NON_EXISTENT if connection was not found + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_connectionID_t>, + std::tuple<> + > asyncDisconnectStubDispatcher; +/** + * this method is used to set the volume of a sink. This function is used to drive + * ramps, to mute or unmute or directly set the value. The difference is made + * through the ramptype. +(at)return E_OK on success, E_UNKNOWN on error, + * E_OUT_OF_RANGE if new volume is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>, + std::tuple<> + > asyncSetSinkVolumeStubDispatcher; +/** + * sets the volume of a source. This method is used to set the volume of a sink. + * This function is used to drive ramps, to mute or unmute or directly set the + * value. The difference is made through the ramptype. +(at)return E_OK on + * success, E_UNKNOWN on error, E_OUT_OF_RANGE if volume is out of + * range. +triggers the acknowledge ackSourceVolumeChange + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>, + std::tuple<> + > asyncSetSourceVolumeStubDispatcher; +/** + * This function is used to set the source state of a particular + * source. +(at)return E_OK on success, E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_SourceState_e>, + std::tuple<> + > asyncSetSourceStateStubDispatcher; +/** + * this function sets the sinksoundproperty. +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sinkID_t, am_SoundProperty_L>, + std::tuple<> + > asyncSetSinkSoundPropertiesStubDispatcher; +/** + * this function sets the sinksoundproperty. +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sinkID_t, am_SoundProperty_s>, + std::tuple<> + > asyncSetSinkSoundPropertyStubDispatcher; +/** + * this function sets the sourcesoundproperty. +(at)return E_OK on success, + * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_SoundProperty_L>, + std::tuple<> + > asyncSetSourceSoundPropertiesStubDispatcher; +/** + * this function sets the sourcesoundproperty. +(at)return E_OK on success, + * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_SoundProperty_s>, + std::tuple<> + > asyncSetSourceSoundPropertyStubDispatcher; +/** + * this function triggers crossfading. +(at)return E_OK on success, E_UNKNOWN on + * error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>, + std::tuple<> + > asyncCrossFadeStubDispatcher; +/** + * this function is used for early and late audio functions to set the domain + * state +(at)return E_OK on success, E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_domainID_t, am_DomainState_e>, + std::tuple<am_Error_e> + > setDomainStateStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_Volumes_L>, + std::tuple<> + > asyncSetVolumesStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sinkID_t, am_NotificationConfiguration_s>, + std::tuple<> + > asyncSetSinkNotificationConfigurationStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlStub, + std::tuple<am_Handle_s, am_sourceID_t, am_NotificationConfiguration_s>, + std::tuple<> + > asyncSetSourceNotificationConfigurationStubDispatcher; + + + + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; - - private: + + private: RoutingControlDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; + CommonAPI::DBus::StubAttributeTable stubAttributeTable_; }; class RoutingControlDBusStubAdapter: public RoutingControlDBusStubAdapterInternal, public std::enable_shared_from_this<RoutingControlDBusStubAdapter> { diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h index 4fe3ad8..71e7935 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.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. @@ -43,7 +43,7 @@ const char* RoutingControlObserver::getInterfaceId() { } CommonAPI::Version RoutingControlObserver::getInterfaceVersion() { - return CommonAPI::Version(0, 1); + return CommonAPI::Version(2, 0); } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp index 9da10db..532ad94 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp @@ -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. @@ -27,7 +27,7 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createRoutingControlObserverDBusProx return std::make_shared<RoutingControlObserverDBusProxy>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } -__attribute__((constructor)) void registerRoutingControlObserverDBusProxy(void) { +INITIALIZER(registerRoutingControlObserverDBusProxy) { CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(RoutingControlObserver::getInterfaceId(), &createRoutingControlObserverDBusProxy); } @@ -320,8 +320,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::ackSinkVolum * 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 */ void RoutingControlObserverDBusProxy::peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string>, @@ -520,8 +520,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::deregisterSi * 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 */ void RoutingControlObserverDBusProxy::peekSource(const std::string& name, CommonAPI::CallStatus& callStatus, am_sourceID_t& sourceID, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string>, @@ -898,8 +898,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::updateSinkAs /** * 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, @@ -1059,8 +1059,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::confirmRouti void RoutingControlObserverDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { - ownVersionMajor = 0; - ownVersionMinor = 1; + ownVersionMajor = 2; + ownVersionMinor = 0; } } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h index 81d8885..3b832d8 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.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. @@ -114,8 +114,8 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx * 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::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> peekDomainAsync(const std::string& name, PeekDomainAsyncCallback callback); @@ -178,8 +178,8 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx * 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::string& name, CommonAPI::CallStatus& callStatus, am_sourceID_t& sourceID, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> peekSourceAsync(const std::string& name, PeekSourceAsyncCallback callback); @@ -284,8 +284,8 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx /** * 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, diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp index 4c8053d..5386b6c 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp @@ -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. @@ -25,7 +25,7 @@ std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createRoutingControlObserverDB return std::make_shared<RoutingControlObserverDBusStubAdapter>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); } -__attribute__((constructor)) void registerRoutingControlObserverDBusStubAdapter(void) { +INITIALIZER(registerRoutingControlObserverDBusStubAdapter) { CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(RoutingControlObserver::getInterfaceId(), &createRoutingControlObserverDBusStubAdapter); } @@ -38,6 +38,7 @@ RoutingControlObserverDBusStubAdapterInternal::~RoutingControlObserverDBusStubAd } void RoutingControlObserverDBusStubAdapterInternal::deactivateManagedInstances() { + } const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { @@ -149,8 +150,8 @@ const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrosp * 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 */ "<method name=\"peekDomain\">\n" "<arg name=\"name\" type=\"s\" direction=\"in\" />\n" @@ -236,8 +237,8 @@ const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrosp * 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 */ "<method name=\"peekSource\">\n" "<arg name=\"name\" type=\"s\" direction=\"in\" />\n" @@ -384,8 +385,8 @@ const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrosp /** * 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, @@ -445,10 +446,10 @@ const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrosp return introspectionData.c_str(); } -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< RoutingControlObserverStub, CommonAPI::Version - > getRoutingControlObserverInterfaceVersionStubDispatcher(&RoutingControlObserverStub::getInterfaceVersion, "uu"); + > RoutingControlObserverDBusStubAdapterInternal::getRoutingControlObserverInterfaceVersionStubDispatcher(&RoutingControlObserverStub::getInterfaceVersion, "uu"); /** * This attribute signals to the clients the current routing state. @@ -456,164 +457,164 @@ A client * should notify himself to this attribute in order to know the current state and * act accordingly. */ -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< RoutingControlObserverStub, am_RoutingReady_e - > getRoutingReadyAttributeStubDispatcher(&RoutingControlObserverStub::getRoutingReadyAttribute, "i"); + > RoutingControlObserverDBusStubAdapterInternal::getRoutingReadyAttributeStubDispatcher(&RoutingControlObserverStub::getRoutingReadyAttribute, "i"); /** * acknowledges a asyncConnect */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_connectionID_t, am_Error_e>, std::tuple<> - > ackConnectStubDispatcher(&RoutingControlObserverStub::ackConnect, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackConnectStubDispatcher(&RoutingControlObserverStub::ackConnect, ""); /** * acknowledges a asyncDisconnect */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_connectionID_t, am_Error_e>, std::tuple<> - > ackDisconnectStubDispatcher(&RoutingControlObserverStub::ackDisconnect, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackDisconnectStubDispatcher(&RoutingControlObserverStub::ackDisconnect, ""); /** * acknowledges a asyncsetSinkVolume */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_volume_t, am_Error_e>, std::tuple<> - > ackSetSinkVolumeChangeStubDispatcher(&RoutingControlObserverStub::ackSetSinkVolumeChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSinkVolumeChangeStubDispatcher(&RoutingControlObserverStub::ackSetSinkVolumeChange, ""); /** * acknowledges a asyncsetSourceVolume */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_volume_t, am_Error_e>, std::tuple<> - > ackSetSourceVolumeChangeStubDispatcher(&RoutingControlObserverStub::ackSetSourceVolumeChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSourceVolumeChangeStubDispatcher(&RoutingControlObserverStub::ackSetSourceVolumeChange, ""); /** * acknowlegde for asyncSetSourceState */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSourceStateStubDispatcher(&RoutingControlObserverStub::ackSetSourceState, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSourceStateStubDispatcher(&RoutingControlObserverStub::ackSetSourceState, ""); /** * acknowledges asyncSetSinkSoundProperties */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSinkSoundPropertiesStubDispatcher(&RoutingControlObserverStub::ackSetSinkSoundProperties, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSinkSoundPropertiesStubDispatcher(&RoutingControlObserverStub::ackSetSinkSoundProperties, ""); /** * acknowledges asyncSetSinkSoundProperty */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSinkSoundPropertyStubDispatcher(&RoutingControlObserverStub::ackSetSinkSoundProperty, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSinkSoundPropertyStubDispatcher(&RoutingControlObserverStub::ackSetSinkSoundProperty, ""); /** * acknowledges asyncSetSourceSoundProperties */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSourceSoundPropertiesStubDispatcher(&RoutingControlObserverStub::ackSetSourceSoundProperties, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSourceSoundPropertiesStubDispatcher(&RoutingControlObserverStub::ackSetSourceSoundProperties, ""); /** * acknowledges asyncSetSourceSoundProperty */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSetSourceSoundPropertyStubDispatcher(&RoutingControlObserverStub::ackSetSourceSoundProperty, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetSourceSoundPropertyStubDispatcher(&RoutingControlObserverStub::ackSetSourceSoundProperty, ""); /** * acknowledges asyncCrossFade */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_HotSink_e, am_Error_e>, std::tuple<> - > ackCrossFadingStubDispatcher(&RoutingControlObserverStub::ackCrossFading, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackCrossFadingStubDispatcher(&RoutingControlObserverStub::ackCrossFading, ""); /** * acknowledges a volume tick. This can be used to display volumechanges during * ramps */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_sourceID_t, am_volume_t>, std::tuple<> - > ackSourceVolumeTickStubDispatcher(&RoutingControlObserverStub::ackSourceVolumeTick, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSourceVolumeTickStubDispatcher(&RoutingControlObserverStub::ackSourceVolumeTick, ""); /** * acknowledges a volume tick. This can be used to display volumechanges during * ramps */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_sinkID_t, am_volume_t>, std::tuple<> - > ackSinkVolumeTickStubDispatcher(&RoutingControlObserverStub::ackSinkVolumeTick, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSinkVolumeTickStubDispatcher(&RoutingControlObserverStub::ackSinkVolumeTick, ""); /** * This function returns the ID to the given domainName. If already a domain is * 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 */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_domainID_t, am_Error_e> - > peekDomainStubDispatcher(&RoutingControlObserverStub::peekDomain, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekDomainStubDispatcher(&RoutingControlObserverStub::peekDomain, "qi"); /** * registers a domain (at)return E_OK on succes, E_ALREADY_EXISTENT if already * registered E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Domain_s, std::string, std::string>, std::tuple<am_domainID_t, am_Error_e> - > registerDomainStubDispatcher(&RoutingControlObserverStub::registerDomain, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerDomainStubDispatcher(&RoutingControlObserverStub::registerDomain, "qi"); /** * deregisters a domain. All sources, sinks, gateways and crossfaders from that * domain will be removed as well. (at)return E_OK on succes, E_NON_EXISTENT if * not found E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_domainID_t>, std::tuple<am_Error_e> - > deregisterDomainStubDispatcher(&RoutingControlObserverStub::deregisterDomain, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterDomainStubDispatcher(&RoutingControlObserverStub::deregisterDomain, "i"); /** * registers a gateway. (at)return E_OK on succes, E_ALREADY_EXISTENT if already * registered E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Gateway_s>, std::tuple<am_gatewayID_t, am_Error_e> - > registerGatewayStubDispatcher(&RoutingControlObserverStub::registerGateway, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerGatewayStubDispatcher(&RoutingControlObserverStub::registerGateway, "qi"); /** * deregisters a gateway. Also removes all sinks and sources of the controlling * domain. (at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on * error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_gatewayID_t>, std::tuple<am_Error_e> - > deregisterGatewayStubDispatcher(&RoutingControlObserverStub::deregisterGateway, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterGatewayStubDispatcher(&RoutingControlObserverStub::deregisterGateway, "i"); /** * This function returns the ID to the given sinkName. If already a sink is * registered with this name, it will return the corresponding ID, if not it will @@ -622,45 +623,45 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< (at)return E_OK on success, * E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_sinkID_t, am_Error_e> - > peekSinkStubDispatcher(&RoutingControlObserverStub::peekSink, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekSinkStubDispatcher(&RoutingControlObserverStub::peekSink, "qi"); /** * Registers a sink. If the sink is part of a gateway, the listconnectionFormats * is copied to the gatewayInformation (at)return E_OK on succes, * E_ALREADY_EXISTENT if already registered E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Sink_s>, std::tuple<am_sinkID_t, am_Error_e> - > registerSinkStubDispatcher(&RoutingControlObserverStub::registerSink, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerSinkStubDispatcher(&RoutingControlObserverStub::registerSink, "qi"); /** * deregisters a sink. (at)return E_OK on succes, E_NON_EXISTENT if not found * E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sinkID_t>, std::tuple<am_Error_e> - > deregisterSinkStubDispatcher(&RoutingControlObserverStub::deregisterSink, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterSinkStubDispatcher(&RoutingControlObserverStub::deregisterSink, "i"); /** * This function returns the ID to the given sourceName. If already a source is * 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 */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_sourceID_t, am_Error_e> - > peekSourceStubDispatcher(&RoutingControlObserverStub::peekSource, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekSourceStubDispatcher(&RoutingControlObserverStub::peekSource, "qi"); /** * registers a source. If the source is part of a gateway, the * listconnectionFormats is copied to the gatewayInformation @@ -668,147 +669,147 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< * success, E_UNKNOWN on error, E_ALREADY_EXIST if either name or sourceID * already exists */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Source_s>, std::tuple<am_sourceID_t, am_Error_e> - > registerSourceStubDispatcher(&RoutingControlObserverStub::registerSource, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerSourceStubDispatcher(&RoutingControlObserverStub::registerSource, "qi"); /** * deregisters a source (at)return E_OK on succes, E_NON_EXISTENT if not found * E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t>, std::tuple<am_Error_e> - > deregisterSourceStubDispatcher(&RoutingControlObserverStub::deregisterSource, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterSourceStubDispatcher(&RoutingControlObserverStub::deregisterSource, "i"); /** * this function registers a crossfader. (at)return E_OK on succes, * E_ALREADY_EXISTENT if already registered E_UNKOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Crossfader_s>, std::tuple<am_crossfaderID_t, am_Error_e> - > registerCrossfaderStubDispatcher(&RoutingControlObserverStub::registerCrossfader, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::registerCrossfaderStubDispatcher(&RoutingControlObserverStub::registerCrossfader, "qi"); /** * this function deregisters a crossfader. removes all sources and sinks assiated * as well. (at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on * error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_crossfaderID_t>, std::tuple<am_Error_e> - > deregisterCrossfaderStubDispatcher(&RoutingControlObserverStub::deregisterCrossfader, "i"); + > RoutingControlObserverDBusStubAdapterInternal::deregisterCrossfaderStubDispatcher(&RoutingControlObserverStub::deregisterCrossfader, "i"); /** * this function peeks a sourceclassID. It is used by the RoutingPlugins to * determine the SinkClassIDs of a sinkClass. (at)return E_OK on succes, * E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_sourceClass_t, am_Error_e> - > peekSourceClassIDStubDispatcher(&RoutingControlObserverStub::peekSourceClassID, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekSourceClassIDStubDispatcher(&RoutingControlObserverStub::peekSourceClassID, "qi"); /** * this function peeks a sourceclassID. It is used by the RoutingPlugins to * determine the SinkClassIDs of a sinkClass. (at)return E_OK on succes, * E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<am_sinkClass_t, am_Error_e> - > peekSinkClassIDStubDispatcher(&RoutingControlObserverStub::peekSinkClassID, "qi"); + > RoutingControlObserverDBusStubAdapterInternal::peekSinkClassIDStubDispatcher(&RoutingControlObserverStub::peekSinkClassID, "qi"); /** * is called when a low level interrupt changes it status. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t, am_InterruptState_e>, std::tuple<> - > hookInterruptStatusChangeStubDispatcher(&RoutingControlObserverStub::hookInterruptStatusChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookInterruptStatusChangeStubDispatcher(&RoutingControlObserverStub::hookInterruptStatusChange, ""); /** * This hook is called when all elements from a domain are registered. Is used by * the Controller to know when all expected domains are finally registered */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_domainID_t>, std::tuple<> - > hookDomainRegistrationCompleteStubDispatcher(&RoutingControlObserverStub::hookDomainRegistrationComplete, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookDomainRegistrationCompleteStubDispatcher(&RoutingControlObserverStub::hookDomainRegistrationComplete, ""); /** * is called when a sink changes its availability */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sinkID_t, am_Availability_s>, std::tuple<> - > hookSinkAvailablityStatusChangeStubDispatcher(&RoutingControlObserverStub::hookSinkAvailablityStatusChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookSinkAvailablityStatusChangeStubDispatcher(&RoutingControlObserverStub::hookSinkAvailablityStatusChange, ""); /** * is called when a source changes its availability */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t, am_Availability_s>, std::tuple<> - > hookSourceAvailablityStatusChangeStubDispatcher(&RoutingControlObserverStub::hookSourceAvailablityStatusChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookSourceAvailablityStatusChangeStubDispatcher(&RoutingControlObserverStub::hookSourceAvailablityStatusChange, ""); /** * is called when a domain changes its status. This used for early domains only */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_domainID_t, am_DomainState_e>, std::tuple<> - > hookDomainStateChangeStubDispatcher(&RoutingControlObserverStub::hookDomainStateChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookDomainStateChangeStubDispatcher(&RoutingControlObserverStub::hookDomainStateChange, ""); /** * is called when the timinginformation (delay) changed for a connection. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_connectionID_t, am_timeSync_t>, std::tuple<> - > hookTimingInformationChangedStubDispatcher(&RoutingControlObserverStub::hookTimingInformationChanged, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookTimingInformationChangedStubDispatcher(&RoutingControlObserverStub::hookTimingInformationChanged, ""); /** * this function is used to send out all data that has been changed in an early * state. (at)return E_OK on success, E_UNKNOWN on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_EarlyData_L>, std::tuple<> - > sendChangedDataStubDispatcher(&RoutingControlObserverStub::sendChangedData, ""); + > RoutingControlObserverDBusStubAdapterInternal::sendChangedDataStubDispatcher(&RoutingControlObserverStub::sendChangedData, ""); /** * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the * gatewayID is not valid. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_gatewayID_t, am_ConnectionFormat_L, am_ConnectionFormat_L, am_Convertion_L>, std::tuple<am_Error_e> - > updateGatewayStubDispatcher(&RoutingControlObserverStub::updateGateway, "i"); + > RoutingControlObserverDBusStubAdapterInternal::updateGatewayStubDispatcher(&RoutingControlObserverStub::updateGateway, "i"); /** * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the * sinkID is not valid. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sinkID_t, am_sinkClass_t, am_SoundProperty_L, am_ConnectionFormat_L, am_MainSoundProperty_L>, std::tuple<am_Error_e> - > updateSinkStubDispatcher(&RoutingControlObserverStub::updateSink, "i"); + > RoutingControlObserverDBusStubAdapterInternal::updateSinkStubDispatcher(&RoutingControlObserverStub::updateSink, "i"); /** * 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, @@ -816,56 +817,57 @@ listConnectionFormats, * listMainSoundProperties */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t, am_sourceClass_t, am_SoundProperty_L, am_ConnectionFormat_L, am_MainSoundProperty_L>, std::tuple<am_Error_e> - > updateSourceStubDispatcher(&RoutingControlObserverStub::updateSource, "i"); + > RoutingControlObserverDBusStubAdapterInternal::updateSourceStubDispatcher(&RoutingControlObserverStub::updateSource, "i"); /** * acknowledges a asyncSetSinkVolumes */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Volumes_L, am_Error_e>, std::tuple<> - > ackSetVolumesStubDispatcher(&RoutingControlObserverStub::ackSetVolumes, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSetVolumesStubDispatcher(&RoutingControlObserverStub::ackSetVolumes, ""); /** * The acknowledge of the SinkNotificationConfiguration */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSinkNotificationConfigurationStubDispatcher(&RoutingControlObserverStub::ackSinkNotificationConfiguration, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSinkNotificationConfigurationStubDispatcher(&RoutingControlObserverStub::ackSinkNotificationConfiguration, ""); /** * The acknowledge of the SourceNotificationConfiguration */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_Handle_s, am_Error_e>, std::tuple<> - > ackSourceNotificationConfigurationStubDispatcher(&RoutingControlObserverStub::ackSourceNotificationConfiguration, ""); + > RoutingControlObserverDBusStubAdapterInternal::ackSourceNotificationConfigurationStubDispatcher(&RoutingControlObserverStub::ackSourceNotificationConfiguration, ""); /** * is called whenever a notified value needs to be send */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sinkID_t, am_NotificationPayload_s>, std::tuple<> - > hookSinkNotificationDataChangeStubDispatcher(&RoutingControlObserverStub::hookSinkNotificationDataChange, ""); + > RoutingControlObserverDBusStubAdapterInternal::hookSinkNotificationDataChangeStubDispatcher(&RoutingControlObserverStub::hookSinkNotificationDataChange, ""); /** * is called whenever a notified value needs to be send */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<am_sourceID_t, am_NotificationPayload_s>, std::tuple<> - > hookSourceNotificationDataChangeStubDispatcher(&RoutingControlObserverStub::hookSourceNotificationDataChange, ""); -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + > RoutingControlObserverDBusStubAdapterInternal::hookSourceNotificationDataChangeStubDispatcher(&RoutingControlObserverStub::hookSourceNotificationDataChange, ""); +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, std::tuple<std::string>, std::tuple<> - > confirmRoutingRundownStubDispatcher(&RoutingControlObserverStub::confirmRoutingRundown, ""); + > RoutingControlObserverDBusStubAdapterInternal::confirmRoutingRundownStubDispatcher(&RoutingControlObserverStub::confirmRoutingRundown, ""); + /** * This attribute signals to the clients the current routing state. @@ -884,10 +886,14 @@ void RoutingControlObserverDBusStubAdapterInternal::fireRoutingReadyAttributeCha } + const RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable& RoutingControlObserverDBusStubAdapterInternal::getStubDispatcherTable() { return stubDispatcherTable_; } +const CommonAPI::DBus::StubAttributeTable& RoutingControlObserverDBusStubAdapterInternal::getStubAttributeTable() { + return stubAttributeTable_; +} RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -921,92 +927,92 @@ RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAda * should notify himself to this attribute in order to know the current state and * act accordingly. */ - { { "getRoutingReadyAttribute", "" }, &org::genivi::am::getRoutingReadyAttributeStubDispatcher } + { { "getRoutingReadyAttribute", "" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::getRoutingReadyAttributeStubDispatcher } , /** * acknowledges a asyncConnect */ - { { "ackConnect", "(iq)qi" }, &org::genivi::am::ackConnectStubDispatcher }, + { { "ackConnect", "(iq)qi" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackConnectStubDispatcher }, /** * acknowledges a asyncDisconnect */ - { { "ackDisconnect", "(iq)qi" }, &org::genivi::am::ackDisconnectStubDispatcher }, + { { "ackDisconnect", "(iq)qi" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackDisconnectStubDispatcher }, /** * acknowledges a asyncsetSinkVolume */ - { { "ackSetSinkVolumeChange", "(iq)ni" }, &org::genivi::am::ackSetSinkVolumeChangeStubDispatcher }, + { { "ackSetSinkVolumeChange", "(iq)ni" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSinkVolumeChangeStubDispatcher }, /** * acknowledges a asyncsetSourceVolume */ - { { "ackSetSourceVolumeChange", "(iq)ni" }, &org::genivi::am::ackSetSourceVolumeChangeStubDispatcher }, + { { "ackSetSourceVolumeChange", "(iq)ni" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSourceVolumeChangeStubDispatcher }, /** * acknowlegde for asyncSetSourceState */ - { { "ackSetSourceState", "(iq)i" }, &org::genivi::am::ackSetSourceStateStubDispatcher }, + { { "ackSetSourceState", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSourceStateStubDispatcher }, /** * acknowledges asyncSetSinkSoundProperties */ - { { "ackSetSinkSoundProperties", "(iq)i" }, &org::genivi::am::ackSetSinkSoundPropertiesStubDispatcher }, + { { "ackSetSinkSoundProperties", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSinkSoundPropertiesStubDispatcher }, /** * acknowledges asyncSetSinkSoundProperty */ - { { "ackSetSinkSoundProperty", "(iq)i" }, &org::genivi::am::ackSetSinkSoundPropertyStubDispatcher }, + { { "ackSetSinkSoundProperty", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSinkSoundPropertyStubDispatcher }, /** * acknowledges asyncSetSourceSoundProperties */ - { { "ackSetSourceSoundProperties", "(iq)i" }, &org::genivi::am::ackSetSourceSoundPropertiesStubDispatcher }, + { { "ackSetSourceSoundProperties", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSourceSoundPropertiesStubDispatcher }, /** * acknowledges asyncSetSourceSoundProperty */ - { { "ackSetSourceSoundProperty", "(iq)i" }, &org::genivi::am::ackSetSourceSoundPropertyStubDispatcher }, + { { "ackSetSourceSoundProperty", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetSourceSoundPropertyStubDispatcher }, /** * acknowledges asyncCrossFade */ - { { "ackCrossFading", "(iq)ii" }, &org::genivi::am::ackCrossFadingStubDispatcher }, + { { "ackCrossFading", "(iq)ii" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackCrossFadingStubDispatcher }, /** * acknowledges a volume tick. This can be used to display volumechanges during * ramps */ - { { "ackSourceVolumeTick", "(iq)qn" }, &org::genivi::am::ackSourceVolumeTickStubDispatcher }, + { { "ackSourceVolumeTick", "(iq)qn" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSourceVolumeTickStubDispatcher }, /** * acknowledges a volume tick. This can be used to display volumechanges during * ramps */ - { { "ackSinkVolumeTick", "(iq)qn" }, &org::genivi::am::ackSinkVolumeTickStubDispatcher }, + { { "ackSinkVolumeTick", "(iq)qn" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSinkVolumeTickStubDispatcher }, /** * This function returns the ID to the given domainName. If already a domain is * 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 */ - { { "peekDomain", "s" }, &org::genivi::am::peekDomainStubDispatcher }, + { { "peekDomain", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekDomainStubDispatcher }, /** * registers a domain (at)return E_OK on succes, E_ALREADY_EXISTENT if already * registered E_UNKOWN on error */ - { { "registerDomain", "(qsssbbi)ss" }, &org::genivi::am::registerDomainStubDispatcher }, + { { "registerDomain", "(qsssbbi)ss" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerDomainStubDispatcher }, /** * deregisters a domain. All sources, sinks, gateways and crossfaders from that * domain will be removed as well. (at)return E_OK on succes, E_NON_EXISTENT if * not found E_UNKOWN on error */ - { { "deregisterDomain", "q" }, &org::genivi::am::deregisterDomainStubDispatcher }, + { { "deregisterDomain", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterDomainStubDispatcher }, /** * registers a gateway. (at)return E_OK on succes, E_ALREADY_EXISTENT if already * registered E_UNKOWN on error */ - { { "registerGateway", "(qsqqqqqaqaqab)" }, &org::genivi::am::registerGatewayStubDispatcher }, + { { "registerGateway", "(qsqqqqqaqaqab)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerGatewayStubDispatcher }, /** * deregisters a gateway. Also removes all sinks and sources of the controlling * domain. (at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on * error */ - { { "deregisterGateway", "q" }, &org::genivi::am::deregisterGatewayStubDispatcher }, + { { "deregisterGateway", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterGatewayStubDispatcher }, /** * This function returns the ID to the given sinkName. If already a sink is * registered with this name, it will return the corresponding ID, if not it will @@ -1015,29 +1021,29 @@ RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAda (at)return E_OK on success, * E_UNKNOWN on error */ - { { "peekSink", "s" }, &org::genivi::am::peekSinkStubDispatcher }, + { { "peekSink", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekSinkStubDispatcher }, /** * Registers a sink. If the sink is part of a gateway, the listconnectionFormats * is copied to the gatewayInformation (at)return E_OK on succes, * E_ALREADY_EXISTENT if already registered E_UNKOWN on error */ - { { "registerSink", "(qsqqnb(iq)ina(qn)aqa(qn)a(qin)a(qin))" }, &org::genivi::am::registerSinkStubDispatcher }, + { { "registerSink", "(qsqqnb(iq)ina(qn)aqa(qn)a(qin)a(qin))" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerSinkStubDispatcher }, /** * deregisters a sink. (at)return E_OK on succes, E_NON_EXISTENT if not found * E_UNKOWN on error */ - { { "deregisterSink", "q" }, &org::genivi::am::deregisterSinkStubDispatcher }, + { { "deregisterSink", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterSinkStubDispatcher }, /** * This function returns the ID to the given sourceName. If already a source is * 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 */ - { { "peekSource", "s" }, &org::genivi::am::peekSourceStubDispatcher }, + { { "peekSource", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekSourceStubDispatcher }, /** * registers a source. If the source is part of a gateway, the * listconnectionFormats is copied to the gatewayInformation @@ -1045,87 +1051,87 @@ RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAda * success, E_UNKNOWN on error, E_ALREADY_EXIST if either name or sourceID * already exists */ - { { "registerSource", "(qqsqinb(iq)ia(qn)aqa(qn)a(qin)a(qin))" }, &org::genivi::am::registerSourceStubDispatcher }, + { { "registerSource", "(qqsqinb(iq)ia(qn)aqa(qn)a(qin)a(qin))" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerSourceStubDispatcher }, /** * deregisters a source (at)return E_OK on succes, E_NON_EXISTENT if not found * E_UNKOWN on error */ - { { "deregisterSource", "q" }, &org::genivi::am::deregisterSourceStubDispatcher }, + { { "deregisterSource", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterSourceStubDispatcher }, /** * this function registers a crossfader. (at)return E_OK on succes, * E_ALREADY_EXISTENT if already registered E_UNKOWN on error */ - { { "registerCrossfader", "(qsqqqi)" }, &org::genivi::am::registerCrossfaderStubDispatcher }, + { { "registerCrossfader", "(qsqqqi)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::registerCrossfaderStubDispatcher }, /** * this function deregisters a crossfader. removes all sources and sinks assiated * as well. (at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on * error */ - { { "deregisterCrossfader", "q" }, &org::genivi::am::deregisterCrossfaderStubDispatcher }, + { { "deregisterCrossfader", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::deregisterCrossfaderStubDispatcher }, /** * this function peeks a sourceclassID. It is used by the RoutingPlugins to * determine the SinkClassIDs of a sinkClass. (at)return E_OK on succes, * E_DATABASE_ERROR on error */ - { { "peekSourceClassID", "s" }, &org::genivi::am::peekSourceClassIDStubDispatcher }, + { { "peekSourceClassID", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekSourceClassIDStubDispatcher }, /** * this function peeks a sourceclassID. It is used by the RoutingPlugins to * determine the SinkClassIDs of a sinkClass. (at)return E_OK on succes, * E_DATABASE_ERROR on error */ - { { "peekSinkClassID", "s" }, &org::genivi::am::peekSinkClassIDStubDispatcher }, + { { "peekSinkClassID", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::peekSinkClassIDStubDispatcher }, /** * is called when a low level interrupt changes it status. */ - { { "hookInterruptStatusChange", "qi" }, &org::genivi::am::hookInterruptStatusChangeStubDispatcher }, + { { "hookInterruptStatusChange", "qi" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookInterruptStatusChangeStubDispatcher }, /** * This hook is called when all elements from a domain are registered. Is used by * the Controller to know when all expected domains are finally registered */ - { { "hookDomainRegistrationComplete", "q" }, &org::genivi::am::hookDomainRegistrationCompleteStubDispatcher }, + { { "hookDomainRegistrationComplete", "q" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookDomainRegistrationCompleteStubDispatcher }, /** * is called when a sink changes its availability */ - { { "hookSinkAvailablityStatusChange", "q(iq)" }, &org::genivi::am::hookSinkAvailablityStatusChangeStubDispatcher }, + { { "hookSinkAvailablityStatusChange", "q(iq)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookSinkAvailablityStatusChangeStubDispatcher }, /** * is called when a source changes its availability */ - { { "hookSourceAvailablityStatusChange", "q(iq)" }, &org::genivi::am::hookSourceAvailablityStatusChangeStubDispatcher }, + { { "hookSourceAvailablityStatusChange", "q(iq)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookSourceAvailablityStatusChangeStubDispatcher }, /** * is called when a domain changes its status. This used for early domains only */ - { { "hookDomainStateChange", "qi" }, &org::genivi::am::hookDomainStateChangeStubDispatcher }, + { { "hookDomainStateChange", "qi" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookDomainStateChangeStubDispatcher }, /** * is called when the timinginformation (delay) changed for a connection. */ - { { "hookTimingInformationChanged", "qn" }, &org::genivi::am::hookTimingInformationChangedStubDispatcher }, + { { "hookTimingInformationChanged", "qn" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookTimingInformationChangedStubDispatcher }, /** * this function is used to send out all data that has been changed in an early * state. (at)return E_OK on success, E_UNKNOWN on error */ - { { "sendChangedData", "a(i(yv)(yv))" }, &org::genivi::am::sendChangedDataStubDispatcher }, + { { "sendChangedData", "a(i(yv)(yv))" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::sendChangedDataStubDispatcher }, /** * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the * gatewayID is not valid. */ - { { "updateGateway", "qaqaqab" }, &org::genivi::am::updateGatewayStubDispatcher }, + { { "updateGateway", "qaqaqab" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::updateGatewayStubDispatcher }, /** * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the * sinkID is not valid. */ - { { "updateSink", "qqa(qn)aqa(qn)" }, &org::genivi::am::updateSinkStubDispatcher }, + { { "updateSink", "qqa(qn)aqa(qn)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::updateSinkStubDispatcher }, /** * 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, @@ -1133,31 +1139,36 @@ RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAda * listMainSoundProperties */ - { { "updateSource", "qqa(qn)aqa(qn)" }, &org::genivi::am::updateSourceStubDispatcher }, + { { "updateSource", "qqa(qn)aqa(qn)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::updateSourceStubDispatcher }, /** * acknowledges a asyncSetSinkVolumes */ - { { "ackSetVolumes", "(iq)a(i(yv)nqn)i" }, &org::genivi::am::ackSetVolumesStubDispatcher }, + { { "ackSetVolumes", "(iq)a(i(yv)nqn)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSetVolumesStubDispatcher }, /** * The acknowledge of the SinkNotificationConfiguration */ - { { "ackSinkNotificationConfiguration", "(iq)i" }, &org::genivi::am::ackSinkNotificationConfigurationStubDispatcher }, + { { "ackSinkNotificationConfiguration", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSinkNotificationConfigurationStubDispatcher }, /** * The acknowledge of the SourceNotificationConfiguration */ - { { "ackSourceNotificationConfiguration", "(iq)i" }, &org::genivi::am::ackSourceNotificationConfigurationStubDispatcher }, + { { "ackSourceNotificationConfiguration", "(iq)i" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::ackSourceNotificationConfigurationStubDispatcher }, /** * is called whenever a notified value needs to be send */ - { { "hookSinkNotificationDataChange", "q(qn)" }, &org::genivi::am::hookSinkNotificationDataChangeStubDispatcher }, + { { "hookSinkNotificationDataChange", "q(qn)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookSinkNotificationDataChangeStubDispatcher }, /** * is called whenever a notified value needs to be send */ - { { "hookSourceNotificationDataChange", "q(qn)" }, &org::genivi::am::hookSourceNotificationDataChangeStubDispatcher }, - { { "confirmRoutingRundown", "s" }, &org::genivi::am::confirmRoutingRundownStubDispatcher } - }) { + { { "hookSourceNotificationDataChange", "q(qn)" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::hookSourceNotificationDataChangeStubDispatcher }, + { { "confirmRoutingRundown", "s" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::confirmRoutingRundownStubDispatcher } + }), + stubAttributeTable_() { + + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::RoutingControlObserverDBusStubAdapterInternal::getRoutingControlObserverInterfaceVersionStubDispatcher }); +} - stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getRoutingControlObserverInterfaceVersionStubDispatcher }); +const bool RoutingControlObserverDBusStubAdapterInternal::hasFreedesktopProperties() { + return false; } } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h index 144e86a..b896433 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.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. @@ -33,7 +33,7 @@ namespace am { typedef CommonAPI::DBus::DBusStubAdapterHelper<RoutingControlObserverStub> RoutingControlObserverDBusStubAdapterHelper; -class RoutingControlObserverDBusStubAdapterInternal: public RoutingControlObserverStubAdapter, public RoutingControlObserverDBusStubAdapterHelper { +class RoutingControlObserverDBusStubAdapterInternal: public virtual RoutingControlObserverStubAdapter, public RoutingControlObserverDBusStubAdapterHelper { public: RoutingControlObserverDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -46,6 +46,8 @@ class RoutingControlObserverDBusStubAdapterInternal: public RoutingControlObserv ~RoutingControlObserverDBusStubAdapterInternal(); + virtual const bool hasFreedesktopProperties(); + /** * This attribute signals to the clients the current routing state. A client @@ -57,15 +59,442 @@ class RoutingControlObserverDBusStubAdapterInternal: public RoutingControlObserv const RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable(); void deactivateManagedInstances(); +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + RoutingControlObserverStub, + CommonAPI::Version + > getRoutingControlObserverInterfaceVersionStubDispatcher; + +/** + * This attribute signals to the clients the current routing state. +A client + * should notify himself to this attribute in order to know the current state and + * act accordingly. + */ +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + RoutingControlObserverStub, + am_RoutingReady_e + > getRoutingReadyAttributeStubDispatcher; + + +/** + * acknowledges a asyncConnect + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_connectionID_t, am_Error_e>, + std::tuple<> + > ackConnectStubDispatcher; +/** + * acknowledges a asyncDisconnect + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_connectionID_t, am_Error_e>, + std::tuple<> + > ackDisconnectStubDispatcher; +/** + * acknowledges a asyncsetSinkVolume + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_volume_t, am_Error_e>, + std::tuple<> + > ackSetSinkVolumeChangeStubDispatcher; +/** + * acknowledges a asyncsetSourceVolume + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_volume_t, am_Error_e>, + std::tuple<> + > ackSetSourceVolumeChangeStubDispatcher; +/** + * acknowlegde for asyncSetSourceState + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSourceStateStubDispatcher; +/** + * acknowledges asyncSetSinkSoundProperties + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSinkSoundPropertiesStubDispatcher; +/** + * acknowledges asyncSetSinkSoundProperty + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSinkSoundPropertyStubDispatcher; +/** + * acknowledges asyncSetSourceSoundProperties + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSourceSoundPropertiesStubDispatcher; +/** + * acknowledges asyncSetSourceSoundProperty + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSetSourceSoundPropertyStubDispatcher; +/** + * acknowledges asyncCrossFade + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_HotSink_e, am_Error_e>, + std::tuple<> + > ackCrossFadingStubDispatcher; +/** + * acknowledges a volume tick. This can be used to display volumechanges during + * ramps + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_sourceID_t, am_volume_t>, + std::tuple<> + > ackSourceVolumeTickStubDispatcher; +/** + * acknowledges a volume tick. This can be used to display volumechanges during + * ramps + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_sinkID_t, am_volume_t>, + std::tuple<> + > ackSinkVolumeTickStubDispatcher; +/** + * This function returns the ID to the given domainName. If already a domain is + * 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 + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_domainID_t, am_Error_e> + > peekDomainStubDispatcher; +/** + * registers a domain +(at)return E_OK on succes, E_ALREADY_EXISTENT if already + * registered E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Domain_s, std::string, std::string>, + std::tuple<am_domainID_t, am_Error_e> + > registerDomainStubDispatcher; +/** + * deregisters a domain. All sources, sinks, gateways and crossfaders from that + * domain will be removed as well. +(at)return E_OK on succes, E_NON_EXISTENT if + * not found E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_domainID_t>, + std::tuple<am_Error_e> + > deregisterDomainStubDispatcher; +/** + * registers a gateway. (at)return E_OK on succes, E_ALREADY_EXISTENT if already + * registered E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Gateway_s>, + std::tuple<am_gatewayID_t, am_Error_e> + > registerGatewayStubDispatcher; +/** + * deregisters a gateway. Also removes all sinks and sources of the controlling + * domain. +(at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on + * error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_gatewayID_t>, + std::tuple<am_Error_e> + > deregisterGatewayStubDispatcher; +/** + * This function returns the ID to the given sinkName. If already a sink is + * registered with this name, it will return the corresponding ID, if not it will + * reserve an ID but not register the sink. The other parameters of the sink will + * be overwritten when the sink is registered. +(at)return E_OK on success, + * E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_sinkID_t, am_Error_e> + > peekSinkStubDispatcher; +/** + * Registers a sink. If the sink is part of a gateway, the listconnectionFormats + * is copied to the gatewayInformation +(at)return E_OK on succes, + * E_ALREADY_EXISTENT if already registered E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Sink_s>, + std::tuple<am_sinkID_t, am_Error_e> + > registerSinkStubDispatcher; +/** + * deregisters a sink. +(at)return E_OK on succes, E_NON_EXISTENT if not found + * E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sinkID_t>, + std::tuple<am_Error_e> + > deregisterSinkStubDispatcher; +/** + * This function returns the ID to the given sourceName. If already a source is + * 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 + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_sourceID_t, am_Error_e> + > peekSourceStubDispatcher; +/** + * registers a source. If the source is part of a gateway, the + * listconnectionFormats is copied to the gatewayInformation +(at)return E_OK on + * success, E_UNKNOWN on error, E_ALREADY_EXIST if either name or sourceID + * already exists + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Source_s>, + std::tuple<am_sourceID_t, am_Error_e> + > registerSourceStubDispatcher; +/** + * deregisters a source +(at)return E_OK on succes, E_NON_EXISTENT if not found + * E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t>, + std::tuple<am_Error_e> + > deregisterSourceStubDispatcher; +/** + * this function registers a crossfader. +(at)return E_OK on succes, + * E_ALREADY_EXISTENT if already registered E_UNKOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Crossfader_s>, + std::tuple<am_crossfaderID_t, am_Error_e> + > registerCrossfaderStubDispatcher; +/** + * this function deregisters a crossfader. removes all sources and sinks assiated + * as well. +(at)return E_OK on succes, E_NON_EXISTENT if not found E_UNKOWN on + * error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_crossfaderID_t>, + std::tuple<am_Error_e> + > deregisterCrossfaderStubDispatcher; +/** + * this function peeks a sourceclassID. It is used by the RoutingPlugins to + * determine the SinkClassIDs of a sinkClass. +(at)return E_OK on succes, + * E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_sourceClass_t, am_Error_e> + > peekSourceClassIDStubDispatcher; +/** + * this function peeks a sourceclassID. It is used by the RoutingPlugins to + * determine the SinkClassIDs of a sinkClass. +(at)return E_OK on succes, + * E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<am_sinkClass_t, am_Error_e> + > peekSinkClassIDStubDispatcher; +/** + * is called when a low level interrupt changes it status. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t, am_InterruptState_e>, + std::tuple<> + > hookInterruptStatusChangeStubDispatcher; +/** + * This hook is called when all elements from a domain are registered. +Is used by + * the Controller to know when all expected domains are finally registered + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_domainID_t>, + std::tuple<> + > hookDomainRegistrationCompleteStubDispatcher; +/** + * is called when a sink changes its availability + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sinkID_t, am_Availability_s>, + std::tuple<> + > hookSinkAvailablityStatusChangeStubDispatcher; +/** + * is called when a source changes its availability + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t, am_Availability_s>, + std::tuple<> + > hookSourceAvailablityStatusChangeStubDispatcher; +/** + * is called when a domain changes its status. This used for early domains only + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_domainID_t, am_DomainState_e>, + std::tuple<> + > hookDomainStateChangeStubDispatcher; +/** + * is called when the timinginformation (delay) changed for a connection. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_connectionID_t, am_timeSync_t>, + std::tuple<> + > hookTimingInformationChangedStubDispatcher; +/** + * this function is used to send out all data that has been changed in an early + * state. +(at)return E_OK on success, E_UNKNOWN on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_EarlyData_L>, + std::tuple<> + > sendChangedDataStubDispatcher; +/** + * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the + * gatewayID is not valid. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_gatewayID_t, am_ConnectionFormat_L, am_ConnectionFormat_L, am_Convertion_L>, + std::tuple<am_Error_e> + > updateGatewayStubDispatcher; +/** + * updates data of an gateway. (at)return E_OK on success, E_NON_EXISTENT if the + * sinkID is not valid. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sinkID_t, am_sinkClass_t, am_SoundProperty_L, am_ConnectionFormat_L, am_MainSoundProperty_L>, + std::tuple<am_Error_e> + > updateSinkStubDispatcher; +/** + * 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 + * changed: +sourceClassID, +listSoundProperties, +listConnectionFormats, + * +listMainSoundProperties + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t, am_sourceClass_t, am_SoundProperty_L, am_ConnectionFormat_L, am_MainSoundProperty_L>, + std::tuple<am_Error_e> + > updateSourceStubDispatcher; +/** + * acknowledges a asyncSetSinkVolumes + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Volumes_L, am_Error_e>, + std::tuple<> + > ackSetVolumesStubDispatcher; +/** + * The acknowledge of the SinkNotificationConfiguration + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSinkNotificationConfigurationStubDispatcher; +/** + * The acknowledge of the SourceNotificationConfiguration + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_Handle_s, am_Error_e>, + std::tuple<> + > ackSourceNotificationConfigurationStubDispatcher; +/** + * is called whenever a notified value needs to be send + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sinkID_t, am_NotificationPayload_s>, + std::tuple<> + > hookSinkNotificationDataChangeStubDispatcher; +/** + * is called whenever a notified value needs to be send + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<am_sourceID_t, am_NotificationPayload_s>, + std::tuple<> + > hookSourceNotificationDataChangeStubDispatcher; +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + RoutingControlObserverStub, + std::tuple<std::string>, + std::tuple<> + > confirmRoutingRundownStubDispatcher; + + + + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; - - private: + + private: RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; + CommonAPI::DBus::StubAttributeTable stubAttributeTable_; }; class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverDBusStubAdapterInternal, public std::enable_shared_from_this<RoutingControlObserverDBusStubAdapter> { diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h index 998e8ae..168e4e3 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.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. @@ -325,8 +325,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 * * Calls peekDomain with synchronous semantics. * @@ -533,8 +533,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 * * Calls peekSource with synchronous semantics. * @@ -920,8 +920,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, @@ -1127,6 +1127,12 @@ public: std::shared_ptr<RoutingControlObserverProxyBase> delegate_; }; +#ifdef WIN32 + typedef RoutingControlObserverProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> RoutingControlObserverProxyDefault; +#else + typedef RoutingControlObserverProxy<> RoutingControlObserverProxyDefault; +#endif + namespace RoutingControlObserverExtensions { /** * This attribute signals to the clients the current routing state. @@ -1141,6 +1147,9 @@ namespace RoutingControlObserverExtensions { static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<RoutingControlObserverProxyBase::RoutingReadyAttribute>, extension_type>::value, "Not CommonAPI Attribute Extension!"); + #ifdef WIN32 + RoutingReadyAttributeExtension() {} + #endif RoutingReadyAttributeExtension(RoutingControlObserverProxyBase& proxy): attributeExtension_(proxy.getRoutingReadyAttribute()) { } @@ -1160,8 +1169,8 @@ namespace RoutingControlObserverExtensions { // template <typename ... _AttributeExtensions> RoutingControlObserverProxy<_AttributeExtensions...>::RoutingControlObserverProxy(std::shared_ptr<CommonAPI::Proxy> delegate): - delegate_(std::dynamic_pointer_cast<RoutingControlObserverProxyBase>(delegate)), - _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlObserverProxyBase>(delegate)))... { + _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlObserverProxyBase>(delegate)))..., + delegate_(std::dynamic_pointer_cast<RoutingControlObserverProxyBase>(delegate)) { } template <typename ... _AttributeExtensions> @@ -1319,8 +1328,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverProxy<_AttributeExtensi * 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 */ template <typename ... _AttributeExtensions> void RoutingControlObserverProxy<_AttributeExtensions...>::peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { @@ -1439,8 +1448,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverProxy<_AttributeExtensi * 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 */ template <typename ... _AttributeExtensions> void RoutingControlObserverProxy<_AttributeExtensions...>::peekSource(const std::string& name, CommonAPI::CallStatus& callStatus, am_sourceID_t& sourceID, am_Error_e& error) { @@ -1657,8 +1666,8 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverProxy<_AttributeExtensi /** * 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, diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h index fa80989..0e9cb01 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.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. @@ -165,8 +165,8 @@ class RoutingControlObserverProxyBase: virtual public CommonAPI::Proxy { * 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::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> peekDomainAsync(const std::string& name, PeekDomainAsyncCallback callback) = 0; @@ -229,8 +229,8 @@ class RoutingControlObserverProxyBase: virtual public CommonAPI::Proxy { * 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::string& name, CommonAPI::CallStatus& callStatus, am_sourceID_t& sourceID, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> peekSourceAsync(const std::string& name, PeekSourceAsyncCallback callback) = 0; @@ -335,8 +335,8 @@ class RoutingControlObserverProxyBase: virtual public CommonAPI::Proxy { /** * 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, diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h index eb61414..214505e 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.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. @@ -87,7 +87,7 @@ class RoutingControlObserverStubRemoteEvent { * This class and the one above are the ones an application developer needs to have * a look at if he wants to implement a service. */ -class RoutingControlObserverStub : public virtual CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent> { +class RoutingControlObserverStub: public virtual CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent> { public: virtual ~RoutingControlObserverStub() { } virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; @@ -168,8 +168,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 */ /// This is the method that will be called on remote calls on the method peekDomain. virtual void peekDomain(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_domainID_t& domainID, am_Error_e& error) = 0; @@ -232,8 +232,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 */ /// This is the method that will be called on remote calls on the method peekSource. virtual void peekSource(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_sourceID_t& sourceID, am_Error_e& error) = 0; @@ -338,8 +338,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, @@ -380,6 +380,8 @@ public: using CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::initStubAdapter; typedef CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::StubAdapterType StubAdapterType; typedef CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; + typedef RoutingControlObserverStubRemoteEvent RemoteEventType; + typedef RoutingControlObserver StubInterface; }; } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp index 46d10f7..a755188 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp @@ -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. @@ -37,7 +37,7 @@ const am_RoutingReady_e& RoutingControlObserverStubDefault::getRoutingReadyAttri void RoutingControlObserverStubDefault::setRoutingReadyAttribute(am_RoutingReady_e value) { const bool valueChanged = trySetRoutingReadyAttribute(std::move(value)); - if (valueChanged) { + if (valueChanged && stubAdapter_ != NULL) { stubAdapter_->fireRoutingReadyAttributeChanged(routingReadyAttributeValue_); } } @@ -196,8 +196,8 @@ void RoutingControlObserverStubDefault::ackSinkVolumeTick(am_Handle_s handle, am * 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 */ void RoutingControlObserverStubDefault::peekDomain(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_domainID_t& domainID, am_Error_e& error) { // Call old style methods in default @@ -308,8 +308,8 @@ void RoutingControlObserverStubDefault::deregisterSink(am_sinkID_t sinkID, am_Er * 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 */ void RoutingControlObserverStubDefault::peekSource(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string name, am_sourceID_t& sourceID, am_Error_e& error) { // Call old style methods in default @@ -510,8 +510,8 @@ void RoutingControlObserverStubDefault::updateSink(am_sinkID_t sinkID, am_sinkCl /** * 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, 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. diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h index 4cc1ba0..a2721d3 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.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. @@ -67,7 +67,7 @@ public: /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match * * Calls asyncConnect with synchronous semantics. * @@ -192,8 +192,8 @@ public: virtual std::future<CommonAPI::CallStatus> asyncSetSourceStateAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_SourceState_e& state, AsyncSetSourceStateAsyncCallback callback); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range * * Calls asyncSetSinkSoundProperties with synchronous semantics. * @@ -216,8 +216,8 @@ public: virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertiesAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, AsyncSetSinkSoundPropertiesAsyncCallback callback); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range * * Calls asyncSetSinkSoundProperty with synchronous semantics. * @@ -443,14 +443,20 @@ public: std::shared_ptr<RoutingControlProxyBase> delegate_; }; +#ifdef WIN32 + typedef RoutingControlProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> RoutingControlProxyDefault; +#else + typedef RoutingControlProxy<> RoutingControlProxyDefault; +#endif + // // RoutingControlProxy Implementation // template <typename ... _AttributeExtensions> RoutingControlProxy<_AttributeExtensions...>::RoutingControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate): - delegate_(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)), - _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)))... { + _AttributeExtensions(*(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)))..., + delegate_(std::dynamic_pointer_cast<RoutingControlProxyBase>(delegate)) { } template <typename ... _AttributeExtensions> @@ -474,7 +480,7 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>: /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ template <typename ... _AttributeExtensions> void RoutingControlProxy<_AttributeExtensions...>::asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) { @@ -549,8 +555,8 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>: } /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ template <typename ... _AttributeExtensions> void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkSoundProperties(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, CommonAPI::CallStatus& callStatus) { @@ -563,8 +569,8 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>: } /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ template <typename ... _AttributeExtensions> void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkSoundProperty(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, CommonAPI::CallStatus& callStatus) { diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h index 75bba47..802c881 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.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. @@ -70,7 +70,7 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy { /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ virtual void asyncConnect(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, CommonAPI::CallStatus& callStatus) = 0; virtual std::future<CommonAPI::CallStatus> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_CustomConnectionFormat_t& connectionFormat, AsyncConnectAsyncCallback callback) = 0; @@ -110,15 +110,15 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy { virtual std::future<CommonAPI::CallStatus> asyncSetSourceStateAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_SourceState_e& state, AsyncSetSourceStateAsyncCallback callback) = 0; /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperties(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, CommonAPI::CallStatus& callStatus) = 0; virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertiesAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_L& listSoundProperties, AsyncSetSinkSoundPropertiesAsyncCallback callback) = 0; /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperty(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, CommonAPI::CallStatus& callStatus) = 0; virtual std::future<CommonAPI::CallStatus> asyncSetSinkSoundPropertyAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_SoundProperty_s& soundProperty, AsyncSetSinkSoundPropertyAsyncCallback callback) = 0; diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h index 5303589..9b027e9 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.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. @@ -83,7 +83,7 @@ class RoutingControlStubRemoteEvent { * This class and the one above are the ones an application developer needs to have * a look at if he wants to implement a service. */ -class RoutingControlStub : public virtual CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent> { +class RoutingControlStub: public virtual CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent> { public: virtual ~RoutingControlStub() { } virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; @@ -99,7 +99,7 @@ public: /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ /// This is the method that will be called on remote calls on the method asyncConnect. virtual void asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat) = 0; @@ -139,15 +139,15 @@ public: virtual void asyncSetSourceState(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_SourceState_e state) = 0; /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ /// This is the method that will be called on remote calls on the method asyncSetSinkSoundProperties. virtual void asyncSetSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_L listSoundProperties) = 0; /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ /// This is the method that will be called on remote calls on the method asyncSetSinkSoundProperty. virtual void asyncSetSinkSoundProperty(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_s soundProperty) = 0; @@ -189,6 +189,8 @@ public: using CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::initStubAdapter; typedef CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::StubAdapterType StubAdapterType; typedef CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; + typedef RoutingControlStubRemoteEvent RemoteEventType; + typedef RoutingControl StubInterface; }; } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp index 77e34e4..e2372f0 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp @@ -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. @@ -44,7 +44,7 @@ void RoutingControlStubDefault::asyncAbort(am_Handle_s handle) { /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ void RoutingControlStubDefault::asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat) { // Call old style methods in default @@ -114,8 +114,8 @@ void RoutingControlStubDefault::asyncSetSourceState(am_Handle_s handle, am_sourc /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ void RoutingControlStubDefault::asyncSetSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_L listSoundProperties) { // Call old style methods in default @@ -127,8 +127,8 @@ void RoutingControlStubDefault::asyncSetSinkSoundProperties(am_Handle_s handle, /** * this function sets the sinksoundproperty. -(at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range +(at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ void RoutingControlStubDefault::asyncSetSinkSoundProperty(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_s soundProperty) { // Call old style methods in default diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h index f411112..cc67547 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.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. @@ -52,7 +52,7 @@ public: /** * connects a source to a sink (at)return E_OK on success, E_UNKNOWN on error, - * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match + * E_WRONG_FORMAT in case am_ConnectionFormat_e does not match */ virtual void asyncConnect(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat); virtual void asyncConnect(am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat); @@ -97,16 +97,16 @@ public: /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_L listSoundProperties); virtual void asyncSetSinkSoundProperties(am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_L listSoundProperties); /** * this function sets the sinksoundproperty. - (at)return E_OK on success, - * E_UNKNOWN on error, E_OUT_OF_RANGE in case the propery value is out of range + (at)return E_OK on success, E_UNKNOWN + * on error, E_OUT_OF_RANGE in case the propery value is out of range */ virtual void asyncSetSinkSoundProperty(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_s soundProperty); virtual void asyncSetSinkSoundProperty(am_Handle_s handle, am_sinkID_t sinkID, am_SoundProperty_s soundProperty); @@ -156,8 +156,7 @@ public: protected: -private: - class RemoteEventHandler: public RoutingControlStubRemoteEvent { + class RemoteEventHandler: public virtual RoutingControlStubRemoteEvent { public: RemoteEventHandler(RoutingControlStubDefault* defaultStub); @@ -165,8 +164,8 @@ private: private: RoutingControlStubDefault* defaultStub_; }; - - RemoteEventHandler remoteEventHandler_; +private: + RoutingControlStubDefault::RemoteEventHandler remoteEventHandler_; CommonAPI::Version interfaceVersion_; |