diff options
Diffstat (limited to 'PluginCommandInterfaceCAPI/src-gen/org/genivi')
12 files changed, 448 insertions, 210 deletions
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp index 161a7b7..7170981 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp +++ b/PluginCommandInterfaceCAPI/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/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h index 17c0c51..ce9ea60 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h +++ b/PluginCommandInterfaceCAPI/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 @@ -2096,7 +2096,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_Availability_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_Availability_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2117,7 +2116,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_HotSink_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_HotSink_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2138,7 +2136,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_ConnectionState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_ConnectionState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2159,7 +2156,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_DomainState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_DomainState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2180,7 +2176,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_EarlyDataType_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_EarlyDataType_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2201,7 +2196,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_Error_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_Error_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2222,7 +2216,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_MuteState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_MuteState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2243,7 +2236,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_InterruptState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_InterruptState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2264,7 +2256,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_VolumeType_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_VolumeType_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2285,7 +2276,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_NotificationStatus_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_NotificationStatus_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2306,7 +2296,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_Handle_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_Handle_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2327,7 +2316,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_SourceState_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_SourceState_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; @@ -2348,7 +2336,6 @@ namespace CommonAPI { template<> struct InputStreamVectorHelper<org::genivi::am::am_RoutingReady_e> { static void beginReadVector(InputStream& inputStream, const std::vector<org::genivi::am::am_RoutingReady_e>& vectorValue) { - (void)vectorValue; inputStream.beginReadInt32EnumVector(); } }; diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h index eb103e5..835be6e 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.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. @@ -47,7 +47,7 @@ const char* CommandControl::getInterfaceId() { } CommonAPI::Version CommandControl::getInterfaceVersion() { - return CommonAPI::Version(1, 0); + return CommonAPI::Version(2, 0); } diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp index e147744..21c3f43 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.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. @@ -31,11 +31,11 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createCommandControlDBusProxy( return std::make_shared<CommandControlDBusProxy>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } -__attribute__((constructor)) void registerCommandControlDBusProxy(void) { +INITIALIZER(registerCommandControlDBusProxy) { CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(CommandControl::getInterfaceId(), &createCommandControlDBusProxy); } - + CommandControlDBusProxy::CommandControlDBusProxy( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, const std::string& commonApiAddress, @@ -216,26 +216,26 @@ std::future<CommonAPI::CallStatus> CommandControlDBusProxy::setVolumeAsync(const /** * This function is used to increment or decrement the current volume for a * sink. -(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ -void CommandControlDBusProxy::volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error) { +void CommandControlDBusProxy::volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, int16_t>, CommonAPI::DBus::DBusSerializableArguments<am_Error_e> >::callMethodWithReply( *this, "volumeStep", "qn", - sinkID, volumeStep_, + sinkID, volStep, callStatus , error); } -std::future<CommonAPI::CallStatus> CommandControlDBusProxy::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback) { +std::future<CommonAPI::CallStatus> CommandControlDBusProxy::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback) { return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t, int16_t>, CommonAPI::DBus::DBusSerializableArguments<am_Error_e> >::callMethodAsync( *this, "volumeStep", "qn", - sinkID, volumeStep_, + sinkID, volStep, std::move(callback)); } /** @@ -384,8 +384,8 @@ std::future<CommonAPI::CallStatus> CommandControlDBusProxy::getListMainSinksAsyn } /** * returns the actual list of Sources -(at)return E_OK on success, - * E_DATABASE_ERROR on error +(at)return E_OK on success, E_DATABASE_ERROR + * on error */ void CommandControlDBusProxy::getListMainSources(CommonAPI::CallStatus& callStatus, am_SourceType_L& listMainSources, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>, @@ -407,8 +407,8 @@ std::future<CommonAPI::CallStatus> CommandControlDBusProxy::getListMainSourcesAs /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair -(at)return E_OK - * on success, E_DATABASE_ERROR on error +(at)return E_OK on + * success, E_DATABASE_ERROR on error */ void CommandControlDBusProxy::getListMainSinkSoundProperties(const am_sinkID_t& sinkID, CommonAPI::CallStatus& callStatus, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) { CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_sinkID_t>, @@ -644,7 +644,7 @@ std::future<CommonAPI::CallStatus> CommandControlDBusProxy::setMainSourceNotific void CommandControlDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { - ownVersionMajor = 1; + ownVersionMajor = 2; ownVersionMinor = 0; } diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h index 64091a7..4cebe6c 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.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. @@ -97,11 +97,11 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ - virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error); - virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback); + virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error); + virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback); /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. @@ -150,16 +150,16 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p virtual std::future<CommonAPI::CallStatus> getListMainSinksAsync(GetListMainSinksAsyncCallback callback); /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ virtual void getListMainSources(CommonAPI::CallStatus& callStatus, am_SourceType_L& listMainSources, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> getListMainSourcesAsync(GetListMainSourcesAsyncCallback callback); /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ virtual void getListMainSinkSoundProperties(const am_sinkID_t& sinkID, CommonAPI::CallStatus& callStatus, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> getListMainSinkSoundPropertiesAsync(const am_sinkID_t& sinkID, GetListMainSinkSoundPropertiesAsyncCallback callback); diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp index db01c28..f8036b2 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.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> createCommandControlDBusStubAd return std::make_shared<CommandControlDBusStubAdapter>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); } -__attribute__((constructor)) void registerCommandControlDBusStubAdapter(void) { +INITIALIZER(registerCommandControlDBusStubAdapter) { CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(CommandControl::getInterfaceId(), &createCommandControlDBusStubAdapter); } @@ -38,6 +38,7 @@ CommandControlDBusStubAdapterInternal::~CommandControlDBusStubAdapterInternal() } void CommandControlDBusStubAdapterInternal::deactivateManagedInstances() { + } const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { @@ -230,12 +231,12 @@ const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ "<method name=\"volumeStep\">\n" "<arg name=\"sinkID\" type=\"q\" direction=\"in\" />\n" - "<arg name=\"volumeStep_\" type=\"n\" direction=\"in\" />\n" + "<arg name=\"volStep\" type=\"n\" direction=\"in\" />\n" "<arg name=\"error\" type=\"i\" direction=\"out\" />\n" "</method>\n" /** @@ -301,8 +302,8 @@ const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm "</method>\n" /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ "<method name=\"getListMainSources\">\n" "<arg name=\"listMainSources\" type=\"a(qs(iq)q)\" direction=\"out\" />\n" @@ -311,8 +312,8 @@ const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ "<method name=\"getListMainSinkSoundProperties\">\n" "<arg name=\"sinkID\" type=\"q\" direction=\"in\" />\n" @@ -412,10 +413,11 @@ const char* CommandControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXm return introspectionData.c_str(); } -static CommonAPI::DBus::DBusGetAttributeStubDispatcher< +CommonAPI::DBus::DBusGetAttributeStubDispatcher< CommandControlStub, CommonAPI::Version - > getCommandControlInterfaceVersionStubDispatcher(&CommandControlStub::getInterfaceVersion, "uu"); + > CommandControlDBusStubAdapterInternal::getCommandControlInterfaceVersionStubDispatcher(&CommandControlStub::getInterfaceVersion, "uu"); + /** @@ -423,52 +425,52 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher< (at)return E_OK on success, E_NOT_POSSIBLE on * failure, E_ALREADY_EXISTS if the connection does already exists */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t, am_sinkID_t>, std::tuple<am_mainConnectionID_t, am_Error_e> - > connectStubDispatcher(&CommandControlStub::connect, "qi"); + > CommandControlDBusStubAdapterInternal::connectStubDispatcher(&CommandControlStub::connect, "qi"); /** * disconnects a mainConnection (at)return E_OK on successes, E_NON_EXISTENT if * the connection does not exist, E_NOT_POSSIBLE on error. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_mainConnectionID_t>, std::tuple<am_Error_e> - > disconnectStubDispatcher(&CommandControlStub::disconnect, "i"); + > CommandControlDBusStubAdapterInternal::disconnectStubDispatcher(&CommandControlStub::disconnect, "i"); /** * sets the volume for a sink (at)return E_OK on success, E_UNKOWN on error, * E_OUT_OF_RANGE in case the value is out of range */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, am_mainVolume_t>, std::tuple<am_Error_e> - > setVolumeStubDispatcher(&CommandControlStub::setVolume, "i"); + > CommandControlDBusStubAdapterInternal::setVolumeStubDispatcher(&CommandControlStub::setVolume, "i"); /** * This function is used to increment or decrement the current volume for a * sink. -(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, int16_t>, std::tuple<am_Error_e> - > volumeStepStubDispatcher(&CommandControlStub::volumeStep, "i"); + > CommandControlDBusStubAdapterInternal::volumeStepStubDispatcher(&CommandControlStub::volumeStep, "i"); /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. * If the mute state is already the desired one, the Daemon will return E_OK. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, am_MuteState_e>, std::tuple<am_Error_e> - > setSinkMuteStateStubDispatcher(&CommandControlStub::setSinkMuteState, "i"); + > CommandControlDBusStubAdapterInternal::setSinkMuteStateStubDispatcher(&CommandControlStub::setSinkMuteState, "i"); /** * This method is used to set sound properties, e.g. Equalizer Values. Since the * capabilities of the system can differ, the exact key value pairs can be @@ -476,11 +478,11 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< (at)return E_OK on success, E_OUT_OF_RANGE if value * exceeds range, E_UNKNOWN in case of an error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, am_MainSoundProperty_s>, std::tuple<am_Error_e> - > setMainSinkSoundPropertyStubDispatcher(&CommandControlStub::setMainSinkSoundProperty, "i"); + > CommandControlDBusStubAdapterInternal::setMainSinkSoundPropertyStubDispatcher(&CommandControlStub::setMainSinkSoundProperty, "i"); /** * This method is used to set sound properties, e.g. Equalizer Values. Since the * capabilities of the system can differ, the exact key value pairs can be @@ -488,153 +490,154 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< (at)return E_OK on success, E_OUT_OF_RANGE if value * exceeds range, E_UNKNOWN in case of an error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t, am_MainSoundProperty_s>, std::tuple<am_Error_e> - > setMainSourceSoundPropertyStubDispatcher(&CommandControlStub::setMainSourceSoundProperty, "i"); + > CommandControlDBusStubAdapterInternal::setMainSourceSoundPropertyStubDispatcher(&CommandControlStub::setMainSourceSoundProperty, "i"); /** * is used to set a specific system property. (at)return E_OK on success, * E_OUT_OF_RANGE if value exceeds range, E_UNKNOWN in case of an error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_SystemProperty_s>, std::tuple<am_Error_e> - > setSystemPropertyStubDispatcher(&CommandControlStub::setSystemProperty, "i"); + > CommandControlDBusStubAdapterInternal::setSystemPropertyStubDispatcher(&CommandControlStub::setSystemProperty, "i"); /** * returns the actual list of MainConnections (at)return E_OK on success, * E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_MainConnection_L, am_Error_e> - > getListMainConnectionsStubDispatcher(&CommandControlStub::getListMainConnections, "a(qqqni)i"); + > CommandControlDBusStubAdapterInternal::getListMainConnectionsStubDispatcher(&CommandControlStub::getListMainConnections, "a(qqqni)i"); /** * returns the actual list of Sinks (at)return E_OK on success, E_DATABASE_ERROR * on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SinkType_L, am_Error_e> - > getListMainSinksStubDispatcher(&CommandControlStub::getListMainSinks, "a(qs(iq)niq)i"); + > CommandControlDBusStubAdapterInternal::getListMainSinksStubDispatcher(&CommandControlStub::getListMainSinks, "a(qs(iq)niq)i"); /** * returns the actual list of Sources -(at)return E_OK on success, - * E_DATABASE_ERROR on error +(at)return E_OK on success, E_DATABASE_ERROR + * on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SourceType_L, am_Error_e> - > getListMainSourcesStubDispatcher(&CommandControlStub::getListMainSources, "a(qs(iq)q)i"); + > CommandControlDBusStubAdapterInternal::getListMainSourcesStubDispatcher(&CommandControlStub::getListMainSources, "a(qs(iq)q)i"); /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair -(at)return E_OK - * on success, E_DATABASE_ERROR on error +(at)return E_OK on + * success, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t>, std::tuple<am_MainSoundProperty_L, am_Error_e> - > getListMainSinkSoundPropertiesStubDispatcher(&CommandControlStub::getListMainSinkSoundProperties, "a(qn)i"); + > CommandControlDBusStubAdapterInternal::getListMainSinkSoundPropertiesStubDispatcher(&CommandControlStub::getListMainSinkSoundProperties, "a(qn)i"); /** * This is used to retrieve all source sound properties related to a * source. (at)return E_OK on success, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t>, std::tuple<am_MainSoundProperty_L, am_Error_e> - > getListMainSourceSoundPropertiesStubDispatcher(&CommandControlStub::getListMainSourceSoundProperties, "a(qn)i"); + > CommandControlDBusStubAdapterInternal::getListMainSourceSoundPropertiesStubDispatcher(&CommandControlStub::getListMainSourceSoundProperties, "a(qn)i"); /** * This is used to retrieve SourceClass Information of all source classes * (at)return E_OK on success, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SourceClass_L, am_Error_e> - > getListSourceClassesStubDispatcher(&CommandControlStub::getListSourceClasses, "a(qsa(qn))i"); + > CommandControlDBusStubAdapterInternal::getListSourceClassesStubDispatcher(&CommandControlStub::getListSourceClasses, "a(qsa(qn))i"); /** * This is used to retrieve SinkClass Information of all sink classes (at)return * E_OK on success, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SinkClass_L, am_Error_e> - > getListSinkClassesStubDispatcher(&CommandControlStub::getListSinkClasses, "a(qsa(qn))i"); + > CommandControlDBusStubAdapterInternal::getListSinkClassesStubDispatcher(&CommandControlStub::getListSinkClasses, "a(qsa(qn))i"); /** * Retrieves a complete list of all systemProperties. (at)return E_OK on success, * E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<>, std::tuple<am_SystemProperty_L, am_Error_e> - > getListSystemPropertiesStubDispatcher(&CommandControlStub::getListSystemProperties, "a(qn)i"); + > CommandControlDBusStubAdapterInternal::getListSystemPropertiesStubDispatcher(&CommandControlStub::getListSystemProperties, "a(qn)i"); /** * returns the delay in ms that the audiopath for the given mainConnection * has (at)return E_OK on success, E_NOT_POSSIBLE if timing information is not * yet retrieved, E_DATABASE_ERROR on read error on the database */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_mainConnectionID_t>, std::tuple<am_timeSync_t, am_Error_e> - > getTimingInformationStubDispatcher(&CommandControlStub::getTimingInformation, "ni"); + > CommandControlDBusStubAdapterInternal::getTimingInformationStubDispatcher(&CommandControlStub::getTimingInformation, "ni"); /** * Retrieves the list of MainNotifications for a sink. Does not return the * possible ones. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t>, std::tuple<am_NotificationConfiguration_L, am_Error_e> - > getListMainSinkNotificationConfigurationsStubDispatcher(&CommandControlStub::getListMainSinkNotificationConfigurations, "a(qin)i"); + > CommandControlDBusStubAdapterInternal::getListMainSinkNotificationConfigurationsStubDispatcher(&CommandControlStub::getListMainSinkNotificationConfigurations, "a(qin)i"); /** * Retrieves the list of MainNotifications for a source. Does not return the * possible ones. */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t>, std::tuple<am_NotificationConfiguration_L, am_Error_e> - > getListMainSourceNotificationConfigurationsStubDispatcher(&CommandControlStub::getListMainSourceNotificationConfigurations, "a(qin)i"); + > CommandControlDBusStubAdapterInternal::getListMainSourceNotificationConfigurationsStubDispatcher(&CommandControlStub::getListMainSourceNotificationConfigurations, "a(qin)i"); /** * sets a MainNotificationConfiuration. This can be used to turn on an off * notifications an to change the mode of the configuration. (at)return E_OK on * success, E_NON_EXISTENT if sinkID does not exists, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sinkID_t, am_NotificationConfiguration_s>, std::tuple<am_Error_e> - > setMainSinkNotificationConfigurationStubDispatcher(&CommandControlStub::setMainSinkNotificationConfiguration, "i"); + > CommandControlDBusStubAdapterInternal::setMainSinkNotificationConfigurationStubDispatcher(&CommandControlStub::setMainSinkNotificationConfiguration, "i"); /** * sets a MainNotificationConfiuration. This can be used to turn on an off * notifications an to change the mode of the configuration. (at)return E_OK on * success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error */ -static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< CommandControlStub, std::tuple<am_sourceID_t, am_NotificationConfiguration_s>, std::tuple<am_Error_e> - > setMainSourceNotificationConfigurationStubDispatcher(&CommandControlStub::setMainSourceNotificationConfiguration, "i"); + > CommandControlDBusStubAdapterInternal::setMainSourceNotificationConfigurationStubDispatcher(&CommandControlStub::setMainSourceNotificationConfiguration, "i"); + /** @@ -912,10 +915,14 @@ void CommandControlDBusStubAdapterInternal::fireMainSourceNotificationConfigurat ); } + const CommandControlDBusStubAdapterHelper::StubDispatcherTable& CommandControlDBusStubAdapterInternal::getStubDispatcherTable() { return stubDispatcherTable_; } +const CommonAPI::DBus::StubAttributeTable& CommandControlDBusStubAdapterInternal::getStubAttributeTable() { + return stubAttributeTable_; +} CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -948,32 +955,32 @@ CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal( (at)return E_OK on success, E_NOT_POSSIBLE on * failure, E_ALREADY_EXISTS if the connection does already exists */ - { { "connect", "qq" }, &org::genivi::am::connectStubDispatcher }, + { { "connect", "qq" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::connectStubDispatcher }, /** * disconnects a mainConnection (at)return E_OK on successes, E_NON_EXISTENT if * the connection does not exist, E_NOT_POSSIBLE on error. */ - { { "disconnect", "q" }, &org::genivi::am::disconnectStubDispatcher }, + { { "disconnect", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::disconnectStubDispatcher }, /** * sets the volume for a sink (at)return E_OK on success, E_UNKOWN on error, * E_OUT_OF_RANGE in case the value is out of range */ - { { "setVolume", "qn" }, &org::genivi::am::setVolumeStubDispatcher }, + { { "setVolume", "qn" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setVolumeStubDispatcher }, /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ - { { "volumeStep", "qn" }, &org::genivi::am::volumeStepStubDispatcher }, + { { "volumeStep", "qn" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::volumeStepStubDispatcher }, /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. * If the mute state is already the desired one, the Daemon will return E_OK. */ - { { "setSinkMuteState", "qi" }, &org::genivi::am::setSinkMuteStateStubDispatcher }, + { { "setSinkMuteState", "qi" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setSinkMuteStateStubDispatcher }, /** * This method is used to set sound properties, e.g. Equalizer Values. Since the * capabilities of the system can differ, the exact key value pairs can be @@ -981,7 +988,7 @@ CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal( (at)return E_OK on success, E_OUT_OF_RANGE if value * exceeds range, E_UNKNOWN in case of an error */ - { { "setMainSinkSoundProperty", "q(qn)" }, &org::genivi::am::setMainSinkSoundPropertyStubDispatcher }, + { { "setMainSinkSoundProperty", "q(qn)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setMainSinkSoundPropertyStubDispatcher }, /** * This method is used to set sound properties, e.g. Equalizer Values. Since the * capabilities of the system can differ, the exact key value pairs can be @@ -989,96 +996,101 @@ CommandControlDBusStubAdapterInternal::CommandControlDBusStubAdapterInternal( (at)return E_OK on success, E_OUT_OF_RANGE if value * exceeds range, E_UNKNOWN in case of an error */ - { { "setMainSourceSoundProperty", "q(qn)" }, &org::genivi::am::setMainSourceSoundPropertyStubDispatcher }, + { { "setMainSourceSoundProperty", "q(qn)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setMainSourceSoundPropertyStubDispatcher }, /** * is used to set a specific system property. (at)return E_OK on success, * E_OUT_OF_RANGE if value exceeds range, E_UNKNOWN in case of an error */ - { { "setSystemProperty", "(qn)" }, &org::genivi::am::setSystemPropertyStubDispatcher }, + { { "setSystemProperty", "(qn)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setSystemPropertyStubDispatcher }, /** * returns the actual list of MainConnections (at)return E_OK on success, * E_DATABASE_ERROR on error */ - { { "getListMainConnections", "" }, &org::genivi::am::getListMainConnectionsStubDispatcher }, + { { "getListMainConnections", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainConnectionsStubDispatcher }, /** * returns the actual list of Sinks (at)return E_OK on success, E_DATABASE_ERROR * on error */ - { { "getListMainSinks", "" }, &org::genivi::am::getListMainSinksStubDispatcher }, + { { "getListMainSinks", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSinksStubDispatcher }, /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ - { { "getListMainSources", "" }, &org::genivi::am::getListMainSourcesStubDispatcher }, + { { "getListMainSources", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSourcesStubDispatcher }, /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ - { { "getListMainSinkSoundProperties", "q" }, &org::genivi::am::getListMainSinkSoundPropertiesStubDispatcher }, + { { "getListMainSinkSoundProperties", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSinkSoundPropertiesStubDispatcher }, /** * This is used to retrieve all source sound properties related to a * source. (at)return E_OK on success, E_DATABASE_ERROR on error */ - { { "getListMainSourceSoundProperties", "q" }, &org::genivi::am::getListMainSourceSoundPropertiesStubDispatcher }, + { { "getListMainSourceSoundProperties", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSourceSoundPropertiesStubDispatcher }, /** * This is used to retrieve SourceClass Information of all source classes * (at)return E_OK on success, E_DATABASE_ERROR on error */ - { { "getListSourceClasses", "" }, &org::genivi::am::getListSourceClassesStubDispatcher }, + { { "getListSourceClasses", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListSourceClassesStubDispatcher }, /** * This is used to retrieve SinkClass Information of all sink classes (at)return * E_OK on success, E_DATABASE_ERROR on error */ - { { "getListSinkClasses", "" }, &org::genivi::am::getListSinkClassesStubDispatcher }, + { { "getListSinkClasses", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListSinkClassesStubDispatcher }, /** * Retrieves a complete list of all systemProperties. (at)return E_OK on success, * E_DATABASE_ERROR on error */ - { { "getListSystemProperties", "" }, &org::genivi::am::getListSystemPropertiesStubDispatcher }, + { { "getListSystemProperties", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListSystemPropertiesStubDispatcher }, /** * returns the delay in ms that the audiopath for the given mainConnection * has (at)return E_OK on success, E_NOT_POSSIBLE if timing information is not * yet retrieved, E_DATABASE_ERROR on read error on the database */ - { { "getTimingInformation", "q" }, &org::genivi::am::getTimingInformationStubDispatcher }, + { { "getTimingInformation", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getTimingInformationStubDispatcher }, /** * Retrieves the list of MainNotifications for a sink. Does not return the * possible ones. */ - { { "getListMainSinkNotificationConfigurations", "q" }, &org::genivi::am::getListMainSinkNotificationConfigurationsStubDispatcher }, + { { "getListMainSinkNotificationConfigurations", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSinkNotificationConfigurationsStubDispatcher }, /** * Retrieves the list of MainNotifications for a source. Does not return the * possible ones. */ - { { "getListMainSourceNotificationConfigurations", "q" }, &org::genivi::am::getListMainSourceNotificationConfigurationsStubDispatcher }, + { { "getListMainSourceNotificationConfigurations", "q" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getListMainSourceNotificationConfigurationsStubDispatcher }, /** * sets a MainNotificationConfiuration. This can be used to turn on an off * notifications an to change the mode of the configuration. (at)return E_OK on * success, E_NON_EXISTENT if sinkID does not exists, E_DATABASE_ERROR on error */ - { { "setMainSinkNotificationConfiguration", "q(qin)" }, &org::genivi::am::setMainSinkNotificationConfigurationStubDispatcher }, + { { "setMainSinkNotificationConfiguration", "q(qin)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setMainSinkNotificationConfigurationStubDispatcher }, /** * sets a MainNotificationConfiuration. This can be used to turn on an off * notifications an to change the mode of the configuration. (at)return E_OK on * success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error */ - { { "setMainSourceNotificationConfiguration", "q(qin)" }, &org::genivi::am::setMainSourceNotificationConfigurationStubDispatcher } - }) { + { { "setMainSourceNotificationConfiguration", "q(qin)" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::setMainSourceNotificationConfigurationStubDispatcher } + }), + stubAttributeTable_() { + + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::CommandControlDBusStubAdapterInternal::getCommandControlInterfaceVersionStubDispatcher }); +} - stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getCommandControlInterfaceVersionStubDispatcher }); +const bool CommandControlDBusStubAdapterInternal::hasFreedesktopProperties() { + return false; } } // namespace am diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h index 8ef3355..46a99eb 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.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. @@ -37,7 +37,7 @@ namespace am { typedef CommonAPI::DBus::DBusStubAdapterHelper<CommandControlStub> CommandControlDBusStubAdapterHelper; -class CommandControlDBusStubAdapterInternal: public CommandControlStubAdapter, public CommandControlDBusStubAdapterHelper { +class CommandControlDBusStubAdapterInternal: public virtual CommandControlStubAdapter, public CommandControlDBusStubAdapterHelper { public: CommandControlDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, @@ -50,6 +50,8 @@ class CommandControlDBusStubAdapterInternal: public CommandControlStubAdapter, p ~CommandControlDBusStubAdapterInternal(); + virtual const bool hasFreedesktopProperties(); + /** * Callback that is called when the number of connections change @@ -146,15 +148,245 @@ class CommandControlDBusStubAdapterInternal: public CommandControlStubAdapter, p const CommandControlDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable(); void deactivateManagedInstances(); +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + CommandControlStub, + CommonAPI::Version + > getCommandControlInterfaceVersionStubDispatcher; + + + +/** + * connects a source to sink +(at)return E_OK on success, E_NOT_POSSIBLE on + * failure, E_ALREADY_EXISTS if the connection does already exists + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t, am_sinkID_t>, + std::tuple<am_mainConnectionID_t, am_Error_e> + > connectStubDispatcher; +/** + * disconnects a mainConnection +(at)return E_OK on successes, E_NON_EXISTENT if + * the connection does not exist, E_NOT_POSSIBLE on error. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_mainConnectionID_t>, + std::tuple<am_Error_e> + > disconnectStubDispatcher; +/** + * sets the volume for a sink +(at)return E_OK on success, E_UNKOWN on error, + * E_OUT_OF_RANGE in case the value is out of range + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, am_mainVolume_t>, + std::tuple<am_Error_e> + > setVolumeStubDispatcher; +/** + * This function is used to increment or decrement the current volume for a + * sink. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, int16_t>, + std::tuple<am_Error_e> + > volumeStepStubDispatcher; +/** + * sets the mute state of a sink +(at)return E_OK on success, E_UNKNOWN on error. + * If the mute state is already the desired one, the Daemon will return E_OK. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, am_MuteState_e>, + std::tuple<am_Error_e> + > setSinkMuteStateStubDispatcher; +/** + * This method is used to set sound properties, e.g. Equalizer Values. Since the + * capabilities of the system can differ, the exact key value pairs can be + * extended in each product +(at)return E_OK on success, E_OUT_OF_RANGE if value + * exceeds range, E_UNKNOWN in case of an error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, am_MainSoundProperty_s>, + std::tuple<am_Error_e> + > setMainSinkSoundPropertyStubDispatcher; +/** + * This method is used to set sound properties, e.g. Equalizer Values. Since the + * capabilities of the system can differ, the exact key value pairs can be + * extended in each product +(at)return E_OK on success, E_OUT_OF_RANGE if value + * exceeds range, E_UNKNOWN in case of an error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t, am_MainSoundProperty_s>, + std::tuple<am_Error_e> + > setMainSourceSoundPropertyStubDispatcher; +/** + * is used to set a specific system property. +(at)return E_OK on success, + * E_OUT_OF_RANGE if value exceeds range, E_UNKNOWN in case of an error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_SystemProperty_s>, + std::tuple<am_Error_e> + > setSystemPropertyStubDispatcher; +/** + * returns the actual list of MainConnections +(at)return E_OK on success, + * E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_MainConnection_L, am_Error_e> + > getListMainConnectionsStubDispatcher; +/** + * returns the actual list of Sinks +(at)return E_OK on success, E_DATABASE_ERROR + * on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SinkType_L, am_Error_e> + > getListMainSinksStubDispatcher; +/** + * returns the actual list of Sources +(at)return E_OK on success, E_DATABASE_ERROR + * on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SourceType_L, am_Error_e> + > getListMainSourcesStubDispatcher; +/** + * This is used to retrieve all source sound properties related to a source. + * Returns a vector of the sound properties and values as pair +(at)return E_OK on + * success, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t>, + std::tuple<am_MainSoundProperty_L, am_Error_e> + > getListMainSinkSoundPropertiesStubDispatcher; +/** + * This is used to retrieve all source sound properties related to a + * source. +(at)return E_OK on success, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t>, + std::tuple<am_MainSoundProperty_L, am_Error_e> + > getListMainSourceSoundPropertiesStubDispatcher; +/** + * This is used to retrieve SourceClass Information of all source classes + * +(at)return E_OK on success, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SourceClass_L, am_Error_e> + > getListSourceClassesStubDispatcher; +/** + * This is used to retrieve SinkClass Information of all sink classes +(at)return + * E_OK on success, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SinkClass_L, am_Error_e> + > getListSinkClassesStubDispatcher; +/** + * Retrieves a complete list of all systemProperties. +(at)return E_OK on success, + * E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<>, + std::tuple<am_SystemProperty_L, am_Error_e> + > getListSystemPropertiesStubDispatcher; +/** + * returns the delay in ms that the audiopath for the given mainConnection + * has +(at)return E_OK on success, E_NOT_POSSIBLE if timing information is not + * yet retrieved, E_DATABASE_ERROR on read error on the database + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_mainConnectionID_t>, + std::tuple<am_timeSync_t, am_Error_e> + > getTimingInformationStubDispatcher; +/** + * Retrieves the list of MainNotifications for a sink. Does not return the + * possible ones. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t>, + std::tuple<am_NotificationConfiguration_L, am_Error_e> + > getListMainSinkNotificationConfigurationsStubDispatcher; +/** + * Retrieves the list of MainNotifications for a source. Does not return the + * possible ones. + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t>, + std::tuple<am_NotificationConfiguration_L, am_Error_e> + > getListMainSourceNotificationConfigurationsStubDispatcher; +/** + * sets a MainNotificationConfiuration. This can be used to turn on an off + * notifications an to change the mode of the configuration. +(at)return E_OK on + * success, E_NON_EXISTENT if sinkID does not exists, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sinkID_t, am_NotificationConfiguration_s>, + std::tuple<am_Error_e> + > setMainSinkNotificationConfigurationStubDispatcher; +/** + * sets a MainNotificationConfiuration. This can be used to turn on an off + * notifications an to change the mode of the configuration. +(at)return E_OK on + * success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error + */ +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + CommandControlStub, + std::tuple<am_sourceID_t, am_NotificationConfiguration_s>, + std::tuple<am_Error_e> + > setMainSourceNotificationConfigurationStubDispatcher; + + + + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; - - private: + + private: CommandControlDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; + CommonAPI::DBus::StubAttributeTable stubAttributeTable_; }; class CommandControlDBusStubAdapter: public CommandControlDBusStubAdapterInternal, public std::enable_shared_from_this<CommandControlDBusStubAdapter> { diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h index 656d3f7..5e98b7b 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -329,8 +329,8 @@ public: /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. * * Calls volumeStep with synchronous semantics. * @@ -340,7 +340,7 @@ public: * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. */ - virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error); + virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error); /** * Calls volumeStep with asynchronous semantics. * @@ -351,7 +351,7 @@ public: * The std::future returned by this method will be fulfilled at arrival of the reply. * It will provide the same value for CallStatus as will be handed to the callback. */ - virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback); + virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback); /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. @@ -506,8 +506,8 @@ public: virtual std::future<CommonAPI::CallStatus> getListMainSinksAsync(GetListMainSinksAsyncCallback callback); /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error * * Calls getListMainSources with synchronous semantics. * @@ -531,8 +531,8 @@ public: /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error * * Calls getListMainSinkSoundProperties with synchronous semantics. * @@ -825,14 +825,20 @@ public: std::shared_ptr<CommandControlProxyBase> delegate_; }; +#ifdef WIN32 + typedef CommandControlProxy<CommonAPI::WINDummyAttributeExtension<CommonAPI::WINDummyAttribute>> CommandControlProxyDefault; +#else + typedef CommandControlProxy<> CommandControlProxyDefault; +#endif + // // CommandControlProxy Implementation // template <typename ... _AttributeExtensions> CommandControlProxy<_AttributeExtensions...>::CommandControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate): - delegate_(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)), - _AttributeExtensions(*(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)))... { + _AttributeExtensions(*(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)))..., + delegate_(std::dynamic_pointer_cast<CommandControlProxyBase>(delegate)) { } template <typename ... _AttributeExtensions> @@ -884,17 +890,17 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>: /** * This function is used to increment or decrement the current volume for a * sink. -(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ template <typename ... _AttributeExtensions> -void CommandControlProxy<_AttributeExtensions...>::volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error) { - delegate_->volumeStep(sinkID, volumeStep_, callStatus, error); +void CommandControlProxy<_AttributeExtensions...>::volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error) { + delegate_->volumeStep(sinkID, volStep, callStatus, error); } template <typename ... _AttributeExtensions> -std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback) { - return delegate_->volumeStepAsync(sinkID, volumeStep_, callback); +std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>::volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback) { + return delegate_->volumeStepAsync(sinkID, volStep, callback); } /** * sets the mute state of a sink @@ -986,8 +992,8 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>: } /** * returns the actual list of Sources -(at)return E_OK on success, - * E_DATABASE_ERROR on error +(at)return E_OK on success, E_DATABASE_ERROR + * on error */ template <typename ... _AttributeExtensions> void CommandControlProxy<_AttributeExtensions...>::getListMainSources(CommonAPI::CallStatus& callStatus, am_SourceType_L& listMainSources, am_Error_e& error) { @@ -1001,8 +1007,8 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>: /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair -(at)return E_OK - * on success, E_DATABASE_ERROR on error +(at)return E_OK on + * success, E_DATABASE_ERROR on error */ template <typename ... _AttributeExtensions> void CommandControlProxy<_AttributeExtensions...>::getListMainSinkSoundProperties(const am_sinkID_t& sinkID, CommonAPI::CallStatus& callStatus, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) { diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h index 377547a..9151ef0 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.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. @@ -211,11 +211,11 @@ class CommandControlProxyBase: virtual public CommonAPI::Proxy { /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ - virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volumeStep_, CommonAPI::CallStatus& callStatus, am_Error_e& error) = 0; - virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volumeStep_, VolumeStepAsyncCallback callback) = 0; + virtual void volumeStep(const am_sinkID_t& sinkID, const int16_t& volStep, CommonAPI::CallStatus& callStatus, am_Error_e& error) = 0; + virtual std::future<CommonAPI::CallStatus> volumeStepAsync(const am_sinkID_t& sinkID, const int16_t& volStep, VolumeStepAsyncCallback callback) = 0; /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. @@ -264,16 +264,16 @@ class CommandControlProxyBase: virtual public CommonAPI::Proxy { virtual std::future<CommonAPI::CallStatus> getListMainSinksAsync(GetListMainSinksAsyncCallback callback) = 0; /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ virtual void getListMainSources(CommonAPI::CallStatus& callStatus, am_SourceType_L& listMainSources, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> getListMainSourcesAsync(GetListMainSourcesAsyncCallback callback) = 0; /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ virtual void getListMainSinkSoundProperties(const am_sinkID_t& sinkID, CommonAPI::CallStatus& callStatus, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> getListMainSinkSoundPropertiesAsync(const am_sinkID_t& sinkID, GetListMainSinkSoundPropertiesAsyncCallback callback) = 0; diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h index 6e8de18..414addd 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.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. @@ -204,7 +204,7 @@ class CommandControlStubRemoteEvent { * 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 CommandControlStub : public virtual CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent> { +class CommandControlStub: public virtual CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent> { public: virtual ~CommandControlStub() { } virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; @@ -234,11 +234,11 @@ public: /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ /// This is the method that will be called on remote calls on the method volumeStep. - virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error) = 0; + virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volStep, am_Error_e& error) = 0; /** * sets the mute state of a sink (at)return E_OK on success, E_UNKNOWN on error. @@ -287,16 +287,16 @@ public: virtual void getListMainSinks(const std::shared_ptr<CommonAPI::ClientId> clientId, am_SinkType_L& listMainSinks, am_Error_e& error) = 0; /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ /// This is the method that will be called on remote calls on the method getListMainSources. virtual void getListMainSources(const std::shared_ptr<CommonAPI::ClientId> clientId, am_SourceType_L& listMainSources, am_Error_e& error) = 0; /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ /// This is the method that will be called on remote calls on the method getListMainSinkSoundProperties. virtual void getListMainSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) = 0; @@ -483,6 +483,8 @@ public: using CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::initStubAdapter; typedef CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::StubAdapterType StubAdapterType; typedef CommonAPI::Stub<CommandControlStubAdapter, CommandControlStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; + typedef CommandControlStubRemoteEvent RemoteEventType; + typedef CommandControl StubInterface; }; } // namespace am diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp index f23f2da..c1e03aa 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.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. @@ -70,14 +70,14 @@ void CommandControlStubDefault::setVolume(am_sinkID_t sinkID, am_mainVolume_t vo /** * This function is used to increment or decrement the current volume for a * sink. -(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. +(at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ -void CommandControlStubDefault::volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error) { +void CommandControlStubDefault::volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volStep, am_Error_e& error) { // Call old style methods in default - volumeStep(sinkID, volumeStep_, error); + volumeStep(sinkID, volStep, error); } -void CommandControlStubDefault::volumeStep(am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error) { +void CommandControlStubDefault::volumeStep(am_sinkID_t sinkID, int16_t volStep, am_Error_e& error) { // No operation in default } @@ -165,8 +165,8 @@ void CommandControlStubDefault::getListMainSinks(am_SinkType_L& listMainSinks, a /** * returns the actual list of Sources -(at)return E_OK on success, - * E_DATABASE_ERROR on error +(at)return E_OK on success, E_DATABASE_ERROR + * on error */ void CommandControlStubDefault::getListMainSources(const std::shared_ptr<CommonAPI::ClientId> clientId, am_SourceType_L& listMainSources, am_Error_e& error) { // Call old style methods in default @@ -179,8 +179,8 @@ void CommandControlStubDefault::getListMainSources(am_SourceType_L& listMainSour /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair -(at)return E_OK - * on success, E_DATABASE_ERROR on error +(at)return E_OK on + * success, E_DATABASE_ERROR on error */ void CommandControlStubDefault::getListMainSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error) { // Call old style methods in default diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h index 2bfe6ba..7f58dbf 100644 --- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h +++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.genivi.commonapi.core 2.1.6.v20140519. * Used org.franca.core 0.8.11.201401091023. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -72,11 +72,11 @@ public: /** * This function is used to increment or decrement the current volume for a * sink. - (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if - * the value is not in the given volume range. + (at)return E_OK on success, E_UNKNOWN on error and E_OUT_OF_RANGE if the + * value is not in the given volume range. */ - virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error); - virtual void volumeStep(am_sinkID_t sinkID, int16_t volumeStep_, am_Error_e& error); + virtual void volumeStep(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, int16_t volStep, am_Error_e& error); + virtual void volumeStep(am_sinkID_t sinkID, int16_t volStep, am_Error_e& error); /** * sets the mute state of a sink @@ -132,8 +132,8 @@ public: /** * returns the actual list of Sources - (at)return E_OK on success, - * E_DATABASE_ERROR on error + (at)return E_OK on success, E_DATABASE_ERROR + * on error */ virtual void getListMainSources(const std::shared_ptr<CommonAPI::ClientId> clientId, am_SourceType_L& listMainSources, am_Error_e& error); virtual void getListMainSources(am_SourceType_L& listMainSources, am_Error_e& error); @@ -141,8 +141,8 @@ public: /** * This is used to retrieve all source sound properties related to a source. * Returns a vector of the sound properties and values as pair - (at)return E_OK - * on success, E_DATABASE_ERROR on error + (at)return E_OK on + * success, E_DATABASE_ERROR on error */ virtual void getListMainSinkSoundProperties(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error); virtual void getListMainSinkSoundProperties(am_sinkID_t sinkID, am_MainSoundProperty_L& listSoundProperties, am_Error_e& error); @@ -316,8 +316,7 @@ public: protected: -private: - class RemoteEventHandler: public CommandControlStubRemoteEvent { + class RemoteEventHandler: public virtual CommandControlStubRemoteEvent { public: RemoteEventHandler(CommandControlStubDefault* defaultStub); @@ -325,8 +324,8 @@ private: private: CommandControlStubDefault* defaultStub_; }; - - RemoteEventHandler remoteEventHandler_; +private: + CommandControlStubDefault::RemoteEventHandler remoteEventHandler_; CommonAPI::Version interfaceVersion_; |