diff options
Diffstat (limited to 'PluginRoutingInterfaceCAPI/src-gen/org/genivi')
22 files changed, 562 insertions, 662 deletions
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp index f79c0f5..161a7b7 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * @author Christian Linke @@ -112,7 +101,7 @@ void am_Route_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) cons outputStream << route; } -am_Availability_s::am_Availability_s(const am_Availability_e& availabilityValue, const am_AvailabilityReason_pe& availabilityReasonValue): +am_Availability_s::am_Availability_s(const am_Availability_e& availabilityValue, const am_CustomAvailabilityReason_t& availabilityReasonValue): availability(availabilityValue), availabilityReason(availabilityReasonValue) { @@ -139,7 +128,7 @@ void am_Availability_s::writeToOutputStream(CommonAPI::OutputStream& outputStrea outputStream << availabilityReason; } -am_ClassProperty_s::am_ClassProperty_s(const am_ClassProperty_pe& classPropertyValue, const int16_t& valueValue): +am_ClassProperty_s::am_ClassProperty_s(const am_CustomClassProperty_t& classPropertyValue, const int16_t& valueValue): classProperty(classPropertyValue), value(valueValue) { @@ -268,7 +257,7 @@ void am_Gateway_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) co outputStream << convertionMatrix; } -am_RoutingElement_s::am_RoutingElement_s(const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_domainID_t& domainIDValue, const am_ConnectionFormat_pe& connectionFormatValue): +am_RoutingElement_s::am_RoutingElement_s(const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_domainID_t& domainIDValue, const am_CustomConnectionFormat_t& connectionFormatValue): sourceID(sourceIDValue), sinkID(sinkIDValue), domainID(domainIDValue), @@ -303,7 +292,7 @@ void am_RoutingElement_s::writeToOutputStream(CommonAPI::OutputStream& outputStr outputStream << connectionFormat; } -am_SoundProperty_s::am_SoundProperty_s(const am_SoundPropertyType_pe& typeValue, const int16_t& valueValue): +am_SoundProperty_s::am_SoundProperty_s(const am_CustomSoundPropertyType_t& typeValue, const int16_t& valueValue): type(typeValue), value(valueValue) { @@ -330,7 +319,7 @@ void am_SoundProperty_s::writeToOutputStream(CommonAPI::OutputStream& outputStre outputStream << value; } -am_SystemProperty_s::am_SystemProperty_s(const am_SystemPropertyType_pe& typeValue, const int16_t& valueValue): +am_SystemProperty_s::am_SystemProperty_s(const am_CustomSystemPropertyType_t& typeValue, const int16_t& valueValue): type(typeValue), value(valueValue) { @@ -524,7 +513,7 @@ void am_Handle_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) con outputStream << handle; } -am_MainSoundProperty_s::am_MainSoundProperty_s(const am_MainSoundPropertyType_pe& typeValue, const int16_t& valueValue): +am_MainSoundProperty_s::am_MainSoundProperty_s(const am_CustomMainSoundPropertyType_t& typeValue, const int16_t& valueValue): type(typeValue), value(valueValue) { @@ -633,7 +622,7 @@ void am_MainConnection_s::writeToOutputStream(CommonAPI::OutputStream& outputStr outputStream << listConnectionID; } -am_NotificationPayload_s::am_NotificationPayload_s(const am_NotificationType_pe& typeValue, const int16_t& valueValue): +am_NotificationPayload_s::am_NotificationPayload_s(const am_CustomNotificationType_t& typeValue, const int16_t& valueValue): type(typeValue), value(valueValue) { @@ -660,7 +649,7 @@ void am_NotificationPayload_s::writeToOutputStream(CommonAPI::OutputStream& outp outputStream << value; } -am_NotificationConfiguration_s::am_NotificationConfiguration_s(const am_NotificationType_pe& typeValue, const am_NotificationStatus_e& statusValue, const int16_t& parameterValue): +am_NotificationConfiguration_s::am_NotificationConfiguration_s(const am_CustomNotificationType_t& typeValue, const am_NotificationStatus_e& statusValue, const int16_t& parameterValue): type(typeValue), status(statusValue), parameter(parameterValue) @@ -919,7 +908,7 @@ void am_EarlyData_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) outputStream << data; } -am_Connection_s::am_Connection_s(const am_connectionID_t& connectionIDValue, const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_timeSync_t& delayValue, const am_ConnectionFormat_pe& connectionFormatValue): +am_Connection_s::am_Connection_s(const am_connectionID_t& connectionIDValue, const am_sourceID_t& sourceIDValue, const am_sinkID_t& sinkIDValue, const am_timeSync_t& delayValue, const am_CustomConnectionFormat_t& connectionFormatValue): connectionID(connectionIDValue), sourceID(sourceIDValue), sinkID(sinkIDValue), @@ -958,7 +947,7 @@ void am_Connection_s::writeToOutputStream(CommonAPI::OutputStream& outputStream) outputStream << connectionFormat; } -am_Volumes_s::am_Volumes_s(const am_VolumeType_e& volumeTypeValue, const am_DataType_u& volumeIDValue, const am_volume_t& volumeValue, const am_RampType_pe& rampValue, const am_time_t& timeValue): +am_Volumes_s::am_Volumes_s(const am_VolumeType_e& volumeTypeValue, const am_DataType_u& volumeIDValue, const am_volume_t& volumeValue, const am_CustomRampType_t& rampValue, const am_time_t& timeValue): volumeType(volumeTypeValue), volumeID(volumeIDValue), volume(volumeValue), diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h index adfd7b3..8996092 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * @author Christian Linke @@ -155,7 +144,7 @@ namespace am { /** * product specific identifier of property */ - typedef uint16_t am_ClassProperty_pe; + typedef uint16_t am_CustomClassProperty_t; /** * describes class properties */ @@ -166,14 +155,14 @@ namespace am { /** * the property as enum */ - am_ClassProperty_pe classProperty; + am_CustomClassProperty_t classProperty; /** * the value of the property */ int16_t value; am_ClassProperty_s() = default; - am_ClassProperty_s(const am_ClassProperty_pe& classProperty, const int16_t& value); + am_ClassProperty_s(const am_CustomClassProperty_t& classProperty, const int16_t& value); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); @@ -246,7 +235,7 @@ namespace am { * This project specific value gives the information about reason for reason for * Source/Sink change */ - typedef uint16_t am_AvailabilityReason_pe; + typedef uint16_t am_CustomAvailabilityReason_t; /** * with the help of this enum, sinks and sources can report their availability * state @@ -304,10 +293,10 @@ namespace am { * the reason for the last change. This can be used to trigger events that deal * with state changes. */ - am_AvailabilityReason_pe availabilityReason; + am_CustomAvailabilityReason_t availabilityReason; am_Availability_s() = default; - am_Availability_s(const am_Availability_e& availability, const am_AvailabilityReason_pe& availabilityReason); + am_Availability_s(const am_Availability_e& availability, const am_CustomAvailabilityReason_t& availabilityReason); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); @@ -473,7 +462,7 @@ namespace am { /** * describes the different system properties. Project specific */ - typedef uint16_t am_SystemPropertyType_pe; + typedef uint16_t am_CustomSystemPropertyType_t; /** * struct describing system properties */ @@ -484,14 +473,14 @@ namespace am { /** * the type that is set */ - am_SystemPropertyType_pe type; + am_CustomSystemPropertyType_t type; /** * the value */ int16_t value; am_SystemProperty_s() = default; - am_SystemProperty_s(const am_SystemPropertyType_pe& type, const int16_t& value); + am_SystemProperty_s(const am_CustomSystemPropertyType_t& type, const int16_t& value); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); @@ -526,7 +515,7 @@ namespace am { /** * Project specific sound properties. */ - typedef uint16_t am_SoundPropertyType_pe; + typedef uint16_t am_CustomSoundPropertyType_t; /** * This enum characterizes the data of the EarlyData_t */ @@ -566,14 +555,14 @@ namespace am { /** * the type of the property - a project specific enum */ - am_SoundPropertyType_pe type; + am_CustomSoundPropertyType_t type; /** * the actual value of the property */ int16_t value; am_SoundProperty_s() = default; - am_SoundProperty_s(const am_SoundPropertyType_pe& type, const int16_t& value); + am_SoundProperty_s(const am_CustomSoundPropertyType_t& type, const int16_t& value); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); @@ -639,7 +628,7 @@ namespace am { * Here are all SoundProperties that can be set via the CommandInterface. Product * specific */ - typedef uint16_t am_MainSoundPropertyType_pe; + typedef uint16_t am_CustomMainSoundPropertyType_t; /** * struct describung mainsound property */ @@ -650,14 +639,14 @@ namespace am { /** * the type of the property */ - am_MainSoundPropertyType_pe type; + am_CustomMainSoundPropertyType_t type; /** * the actual value */ int16_t value; am_MainSoundProperty_s() = default; - am_MainSoundProperty_s(const am_MainSoundPropertyType_pe& type, const int16_t& value); + am_MainSoundProperty_s(const am_CustomMainSoundPropertyType_t& type, const int16_t& value); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); @@ -675,7 +664,7 @@ namespace am { /** * gives the type of the Notification. */ - typedef uint16_t am_NotificationType_pe; + typedef uint16_t am_CustomNotificationType_t; enum class am_NotificationStatus_e: int32_t { NS_UNKNOWN = 0, /** @@ -717,7 +706,7 @@ namespace am { /** * The notification type of the notification */ - am_NotificationType_pe type; + am_CustomNotificationType_t type; /** * The Notification status. This can be periodic, min/max value based or even off * for example @@ -738,7 +727,7 @@ namespace am { int16_t parameter; am_NotificationConfiguration_s() = default; - am_NotificationConfiguration_s(const am_NotificationType_pe& type, const am_NotificationStatus_e& status, const int16_t& parameter); + am_NotificationConfiguration_s(const am_CustomNotificationType_t& type, const am_NotificationStatus_e& status, const int16_t& parameter); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); @@ -766,7 +755,7 @@ namespace am { * This project specific value classifies the format in which data is exchanged * within a connection. */ - typedef uint16_t am_ConnectionFormat_pe; + typedef uint16_t am_CustomConnectionFormat_t; /** * This represents one "hopp" in a route */ @@ -789,10 +778,10 @@ namespace am { /** * the connectionformat that is used for the route */ - am_ConnectionFormat_pe connectionFormat; + am_CustomConnectionFormat_t connectionFormat; am_RoutingElement_s() = default; - am_RoutingElement_s(const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_domainID_t& domainID, const am_ConnectionFormat_pe& connectionFormat); + am_RoutingElement_s(const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_domainID_t& domainID, const am_CustomConnectionFormat_t& connectionFormat); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); @@ -826,7 +815,7 @@ namespace am { * responsibility of the product to make sure that the routing plugins are aware * of the ramp types used. */ - typedef uint16_t am_RampType_pe; + typedef uint16_t am_CustomRampType_t; /** * This datatype determines if a sourceID or a sinkID is used in the union * following @@ -868,14 +857,14 @@ namespace am { /** * the ramp that shall be driven */ - am_RampType_pe ramp; + am_CustomRampType_t ramp; /** * the time for the ramp */ am_time_t time; am_Volumes_s() = default; - am_Volumes_s(const am_VolumeType_e& volumeType, const am_DataType_u& volumeID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time); + am_Volumes_s(const am_VolumeType_e& volumeType, const am_DataType_u& volumeID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); @@ -890,7 +879,7 @@ namespace am { } }; typedef std::vector<am_Volumes_s> am_Volumes_L; - typedef std::vector<am_ConnectionFormat_pe> am_ConnectionFormat_L; + typedef std::vector<am_CustomConnectionFormat_t> am_ConnectionFormat_L; typedef bool am_bool_t; typedef std::vector<am_bool_t> am_Convertion_L; /** @@ -1389,7 +1378,7 @@ namespace am { /** * This defines the notification type */ - am_NotificationType_pe type; + am_CustomNotificationType_t type; /** * This is finally the value of the notification. It's meaning depends on the * notificationType @@ -1397,7 +1386,7 @@ namespace am { int16_t value; am_NotificationPayload_s() = default; - am_NotificationPayload_s(const am_NotificationType_pe& type, const int16_t& value); + am_NotificationPayload_s(const am_CustomNotificationType_t& type, const int16_t& value); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); @@ -1783,10 +1772,10 @@ namespace am { /** * the used connectionformat */ - am_ConnectionFormat_pe connectionFormat; + am_CustomConnectionFormat_t connectionFormat; am_Connection_s() = default; - am_Connection_s(const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_timeSync_t& delay, const am_ConnectionFormat_pe& connectionFormat); + am_Connection_s(const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_timeSync_t& delay, const am_CustomConnectionFormat_t& connectionFormat); virtual void readFromInputStream(CommonAPI::InputStream& inputStream); diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h index 03a54a5..5cb6ccb 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * This class implements everything from Audiomanager -> RoutingAdapter @@ -27,6 +16,7 @@ + #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION #endif @@ -53,7 +43,7 @@ const char* RoutingControl::getInterfaceId() { } CommonAPI::Version RoutingControl::getInterfaceVersion() { - return CommonAPI::Version(0, 1); + return CommonAPI::Version(1, 0); } @@ -68,7 +58,7 @@ namespace CommonAPI { namespace std { //hashes for types - + //hashes for error types } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp index 47904ac..e32836f 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * This class implements everything from Audiomanager -> RoutingAdapter @@ -67,7 +56,7 @@ void RoutingControlDBusProxy::asyncAbort(const am_Handle_s& handle, CommonAPI::C *this, "asyncAbort", "(iq)", - handle, + handle, callStatus ); } @@ -83,20 +72,20 @@ 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_ConnectionFormat_e does not match + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t 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_ConnectionFormat_pe& connectionFormat, CommonAPI::CallStatus& callStatus) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_ConnectionFormat_pe>, +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>, CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( *this, "asyncConnect", "(iq)qqqq", - handle, connectionID, sourceID, sinkID, connectionFormat, + handle, connectionID, sourceID, sinkID, connectionFormat, callStatus ); } -std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_ConnectionFormat_pe>, +std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::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) { + return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>, CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( *this, "asyncConnect", @@ -115,7 +104,7 @@ void RoutingControlDBusProxy::asyncDisconnect(const am_Handle_s& handle, const a *this, "asyncDisconnect", "(iq)q", - handle, connectionID, + handle, connectionID, callStatus ); } @@ -135,18 +124,18 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncDisconnectAsync (at)return E_OK on success, E_UNKNOWN on error, * E_OUT_OF_RANGE if new volume is out of range */ -void RoutingControlDBusProxy::asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_volume_t, am_RampType_pe, am_time_t>, +void RoutingControlDBusProxy::asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) { + CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>, CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( *this, "asyncSetSinkVolume", "(iq)qnqn", - handle, sinkID, volume, ramp, time, + handle, sinkID, volume, ramp, time, callStatus ); } -std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_volume_t, am_RampType_pe, am_time_t>, +std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) { + return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>, CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( *this, "asyncSetSinkVolume", @@ -163,18 +152,18 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSinkVolumeAs * range. triggers the acknowledge ackSourceVolumeChange */ -void RoutingControlDBusProxy::asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sourceID_t, am_volume_t, am_RampType_pe, am_time_t>, +void RoutingControlDBusProxy::asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) { + CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>, CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( *this, "asyncSetSourceVolume", "(iq)qnqn", - handle, sourceID, volume, ramp, time, + handle, sourceID, volume, ramp, time, callStatus ); } -std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sourceID_t, am_volume_t, am_RampType_pe, am_time_t>, +std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) { + return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>, CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( *this, "asyncSetSourceVolume", @@ -193,7 +182,7 @@ void RoutingControlDBusProxy::asyncSetSourceState(const am_Handle_s& handle, con *this, "asyncSetSourceState", "(iq)qi", - handle, sourceID, state, + handle, sourceID, state, callStatus ); } @@ -217,7 +206,7 @@ void RoutingControlDBusProxy::asyncSetSinkSoundProperties(const am_Handle_s& han *this, "asyncSetSinkSoundProperties", "(iq)qa(qn)", - handle, sinkID, listSoundProperties, + handle, sinkID, listSoundProperties, callStatus ); } @@ -241,7 +230,7 @@ void RoutingControlDBusProxy::asyncSetSinkSoundProperty(const am_Handle_s& handl *this, "asyncSetSinkSoundProperty", "(iq)q(qn)", - handle, sinkID, soundProperty, + handle, sinkID, soundProperty, callStatus ); } @@ -265,7 +254,7 @@ void RoutingControlDBusProxy::asyncSetSourceSoundProperties(const am_Handle_s& h *this, "asyncSetSourceSoundProperties", "(iq)qa(qn)", - handle, sourceID, listSoundProperties, + handle, sourceID, listSoundProperties, callStatus ); } @@ -289,7 +278,7 @@ void RoutingControlDBusProxy::asyncSetSourceSoundProperty(const am_Handle_s& han *this, "asyncSetSourceSoundProperty", "(iq)q(qn)", - handle, sourceID, soundProperty, + handle, sourceID, soundProperty, callStatus ); } @@ -307,18 +296,18 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceSoundP (at)return E_OK on success, E_UNKNOWN on * error */ -void RoutingControlDBusProxy::asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_RampType_pe, am_time_t>, +void RoutingControlDBusProxy::asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) { + CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>, CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply( *this, "asyncCrossFade", "(iq)qiqn", - handle, crossfaderID, hotSink, rampType, time, + handle, crossfaderID, hotSink, rampType, time, callStatus ); } -std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_RampType_pe, am_time_t>, +std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) { + return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>, CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync( *this, "asyncCrossFade", @@ -337,7 +326,7 @@ void RoutingControlDBusProxy::setDomainState(const am_domainID_t& domainID, cons *this, "setDomainState", "qi", - domainID, domainState, + domainID, domainState, callStatus , error); } @@ -356,7 +345,7 @@ void RoutingControlDBusProxy::asyncSetVolumes(const am_Handle_s& handle, const a *this, "asyncSetVolumes", "(iq)a(i(yv)nqn)", - handle, volumes, + handle, volumes, callStatus ); } @@ -375,7 +364,7 @@ void RoutingControlDBusProxy::asyncSetSinkNotificationConfiguration(const am_Han *this, "asyncSetSinkNotificationConfiguration", "(iq)q(qin)", - handle, sinkID, notificationConfiguration, + handle, sinkID, notificationConfiguration, callStatus ); } @@ -394,7 +383,7 @@ void RoutingControlDBusProxy::asyncSetSourceNotificationConfiguration(const am_H *this, "asyncSetSourceNotificationConfiguration", "(iq)q(qin)", - handle, sourceID, notificationConfiguration, + handle, sourceID, notificationConfiguration, callStatus ); } @@ -411,8 +400,8 @@ std::future<CommonAPI::CallStatus> RoutingControlDBusProxy::asyncSetSourceNotifi void RoutingControlDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { - ownVersionMajor = 0; - ownVersionMinor = 1; + ownVersionMajor = 1; + ownVersionMinor = 0; } } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h index c5afaaf..f9036d4 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * This class implements everything from Audiomanager -> RoutingAdapter @@ -66,10 +55,10 @@ 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_ConnectionFormat_e does not match + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t 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_ConnectionFormat_pe& 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_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback); + 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); /** * disconnect a connection with given connectionID (at)return E_OK on success, @@ -84,8 +73,8 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p (at)return E_OK on success, E_UNKNOWN on error, * E_OUT_OF_RANGE if new volume is out of range */ - virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus); - virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback); + virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus); + virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback); /** * 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 @@ -95,8 +84,8 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p * range. triggers the acknowledge ackSourceVolumeChange */ - virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus); - virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback); + virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus); + virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback); /** * This function is used to set the source state of a particular * source. @@ -137,8 +126,8 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p (at)return E_OK on success, E_UNKNOWN on * error */ - virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus); - virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback); + virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus); + virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback); /** * this function is used for early and late audio functions to set the domain * state @@ -152,13 +141,13 @@ class RoutingControlDBusProxy: virtual public RoutingControlProxyBase, virtual p virtual std::future<CommonAPI::CallStatus> asyncSetSinkNotificationConfigurationAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_NotificationConfiguration_s& notificationConfiguration, AsyncSetSinkNotificationConfigurationAsyncCallback callback); virtual void asyncSetSourceNotificationConfiguration(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& notificationConfiguration, CommonAPI::CallStatus& callStatus); virtual std::future<CommonAPI::CallStatus> asyncSetSourceNotificationConfigurationAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& notificationConfiguration, AsyncSetSourceNotificationConfigurationAsyncCallback callback); - + virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const; private: - + }; diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp index bc82420..8563781 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ #include "RoutingControlDBusStubAdapter.h" #include <org/genivi/am/RoutingControl.h> @@ -41,31 +30,21 @@ __attribute__((constructor)) void registerRoutingControlDBusStubAdapter(void) { &createRoutingControlDBusStubAdapter); } -RoutingControlDBusStubAdapter::RoutingControlDBusStubAdapter( - const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, - const std::string& commonApiAddress, - const std::string& dbusInterfaceName, - const std::string& dbusBusName, - const std::string& dbusObjectPath, - const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection, - const std::shared_ptr<CommonAPI::StubBase>& stub): - RoutingControlDBusStubAdapterHelper(factory, commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, - dbusConnection, std::dynamic_pointer_cast<RoutingControlStub>(stub), - NULL) - { -} -RoutingControlDBusStubAdapter::~RoutingControlDBusStubAdapter() { + +RoutingControlDBusStubAdapterInternal::~RoutingControlDBusStubAdapterInternal() { deactivateManagedInstances(); - deinit(); - stub_.reset(); + RoutingControlDBusStubAdapterHelper::deinit(); } -void RoutingControlDBusStubAdapter::deactivateManagedInstances() { +void RoutingControlDBusStubAdapterInternal::deactivateManagedInstances() { } -const char* RoutingControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const { - static const char* introspectionData = +const char* RoutingControlDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { + static const std::string introspectionData = + "<method name=\"getInterfaceVersion\">\n" + "<arg name=\"value\" type=\"uu\" direction=\"out\" />" + "</method>\n" /** * aborts an asynchronous action. (at)return E_OK on success, E_UNKNOWN on error, @@ -77,7 +56,7 @@ const char* RoutingControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData() /** * 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 + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match */ "<method name=\"asyncConnect\">\n" "<arg name=\"handle\" type=\"(iq)\" direction=\"in\" />\n" @@ -211,10 +190,15 @@ const char* RoutingControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData() "<arg name=\"sourceID\" type=\"q\" direction=\"in\" />\n" "<arg name=\"notificationConfiguration\" type=\"(qin)\" direction=\"in\" />\n" "</method>\n" + ; - return introspectionData; + return introspectionData.c_str(); } +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + RoutingControlStub, + CommonAPI::Version + > getRoutingControlInterfaceVersionStubDispatcher(&RoutingControlStub::getInterfaceVersion, "uu"); /** @@ -230,11 +214,11 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< /** * 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 + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match */ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, - std::tuple<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_ConnectionFormat_pe>, + std::tuple<am_Handle_s, am_connectionID_t, am_sourceID_t, am_sinkID_t, am_CustomConnectionFormat_t>, std::tuple<> > asyncConnectStubDispatcher(&RoutingControlStub::asyncConnect, ""); /** @@ -256,7 +240,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< */ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, - std::tuple<am_Handle_s, am_sinkID_t, am_volume_t, am_RampType_pe, am_time_t>, + std::tuple<am_Handle_s, am_sinkID_t, am_volume_t, am_CustomRampType_t, am_time_t>, std::tuple<> > asyncSetSinkVolumeStubDispatcher(&RoutingControlStub::asyncSetSinkVolume, ""); /** @@ -270,7 +254,7 @@ triggers the acknowledge ackSourceVolumeChange */ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, - std::tuple<am_Handle_s, am_sourceID_t, am_volume_t, am_RampType_pe, am_time_t>, + std::tuple<am_Handle_s, am_sourceID_t, am_volume_t, am_CustomRampType_t, am_time_t>, std::tuple<> > asyncSetSourceVolumeStubDispatcher(&RoutingControlStub::asyncSetSourceVolume, ""); /** @@ -330,7 +314,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< */ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlStub, - std::tuple<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_RampType_pe, am_time_t>, + std::tuple<am_Handle_s, am_crossfaderID_t, am_HotSink_e, am_CustomRampType_t, am_time_t>, std::tuple<> > asyncCrossFadeStubDispatcher(&RoutingControlStub::asyncCrossFade, ""); /** @@ -361,8 +345,37 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< -const RoutingControlDBusStubAdapter::StubDispatcherTable& RoutingControlDBusStubAdapter::getStubDispatcherTable() { - static const RoutingControlDBusStubAdapter::StubDispatcherTable stubDispatcherTable = { +const RoutingControlDBusStubAdapterHelper::StubDispatcherTable& RoutingControlDBusStubAdapterInternal::getStubDispatcherTable() { + return stubDispatcherTable_; +} + + +RoutingControlDBusStubAdapterInternal::RoutingControlDBusStubAdapterInternal( + const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, + const std::string& commonApiAddress, + const std::string& dbusInterfaceName, + const std::string& dbusBusName, + const std::string& dbusObjectPath, + const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection, + const std::shared_ptr<CommonAPI::StubBase>& stub): + CommonAPI::DBus::DBusStubAdapter( + factory, + commonApiAddress, + dbusInterfaceName, + dbusBusName, + dbusObjectPath, + dbusConnection, + false), + RoutingControlDBusStubAdapterHelper( + factory, + commonApiAddress, + dbusInterfaceName, + dbusBusName, + dbusObjectPath, + dbusConnection, + std::dynamic_pointer_cast<RoutingControlStub>(stub), + false), + stubDispatcherTable_({ /** * aborts an asynchronous action. (at)return E_OK on success, E_UNKNOWN on error, @@ -372,7 +385,7 @@ const RoutingControlDBusStubAdapter::StubDispatcherTable& RoutingControlDBusStub /** * 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 + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match */ { { "asyncConnect", "(iq)qqqq" }, &org::genivi::am::asyncConnectStubDispatcher }, /** @@ -444,10 +457,10 @@ const RoutingControlDBusStubAdapter::StubDispatcherTable& RoutingControlDBusStub { { "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 } - }; - return stubDispatcherTable; -} + }) { + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getRoutingControlInterfaceVersionStubDispatcher }); +} } // namespace am } // namespace genivi diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h index 5efbe84..5f73bcb 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * This class implements everything from Audiomanager -> RoutingAdapter @@ -44,9 +33,9 @@ namespace am { typedef CommonAPI::DBus::DBusStubAdapterHelper<RoutingControlStub> RoutingControlDBusStubAdapterHelper; -class RoutingControlDBusStubAdapter: public RoutingControlStubAdapter, public RoutingControlDBusStubAdapterHelper { +class RoutingControlDBusStubAdapterInternal: public RoutingControlStubAdapter, public RoutingControlDBusStubAdapterHelper { public: - RoutingControlDBusStubAdapter( + RoutingControlDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, const std::string& commonApiAddress, const std::string& dbusInterfaceName, @@ -55,19 +44,49 @@ class RoutingControlDBusStubAdapter: public RoutingControlStubAdapter, public Ro const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection, const std::shared_ptr<CommonAPI::StubBase>& stub); - ~RoutingControlDBusStubAdapter(); + ~RoutingControlDBusStubAdapterInternal(); - - const StubDispatcherTable& getStubDispatcherTable(); - + + const RoutingControlDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + void deactivateManagedInstances(); + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; private: + RoutingControlDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; +}; + +class RoutingControlDBusStubAdapter: public RoutingControlDBusStubAdapterInternal, public std::enable_shared_from_this<RoutingControlDBusStubAdapter> { +public: + RoutingControlDBusStubAdapter( + const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, + const std::string& commonApiAddress, + const std::string& dbusInterfaceName, + const std::string& dbusBusName, + const std::string& dbusObjectPath, + const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection, + const std::shared_ptr<CommonAPI::StubBase>& stub) : + CommonAPI::DBus::DBusStubAdapter( + factory, + commonApiAddress, + dbusInterfaceName, + dbusBusName, + dbusObjectPath, + dbusConnection, + false), + RoutingControlDBusStubAdapterInternal( + factory, + commonApiAddress, + dbusInterfaceName, + dbusBusName, + dbusObjectPath, + dbusConnection, + stub) { } }; } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h index 7e4c027..4fe3ad8 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * Routing Receive sendInterface description. @@ -27,6 +16,7 @@ + #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION #endif @@ -68,7 +58,7 @@ namespace CommonAPI { namespace std { //hashes for types - + //hashes for error types } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp index b23a0e4..9da10db 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * Routing Receive sendInterface description. @@ -69,7 +58,7 @@ void RoutingControlObserverDBusProxy::ackConnect(const am_Handle_s& handle, cons *this, "ackConnect", "(iq)qi", - handle, connectionID, error, + handle, connectionID, error, callStatus ); } @@ -91,7 +80,7 @@ void RoutingControlObserverDBusProxy::ackDisconnect(const am_Handle_s& handle, c *this, "ackDisconnect", "(iq)qi", - handle, connectionID, error, + handle, connectionID, error, callStatus ); } @@ -113,7 +102,7 @@ void RoutingControlObserverDBusProxy::ackSetSinkVolumeChange(const am_Handle_s& *this, "ackSetSinkVolumeChange", "(iq)ni", - handle, volume, error, + handle, volume, error, callStatus ); } @@ -135,7 +124,7 @@ void RoutingControlObserverDBusProxy::ackSetSourceVolumeChange(const am_Handle_s *this, "ackSetSourceVolumeChange", "(iq)ni", - handle, volume, error, + handle, volume, error, callStatus ); } @@ -157,7 +146,7 @@ void RoutingControlObserverDBusProxy::ackSetSourceState(const am_Handle_s& handl *this, "ackSetSourceState", "(iq)i", - handle, error, + handle, error, callStatus ); } @@ -179,7 +168,7 @@ void RoutingControlObserverDBusProxy::ackSetSinkSoundProperties(const am_Handle_ *this, "ackSetSinkSoundProperties", "(iq)i", - handle, error, + handle, error, callStatus ); } @@ -201,7 +190,7 @@ void RoutingControlObserverDBusProxy::ackSetSinkSoundProperty(const am_Handle_s& *this, "ackSetSinkSoundProperty", "(iq)i", - handle, error, + handle, error, callStatus ); } @@ -223,7 +212,7 @@ void RoutingControlObserverDBusProxy::ackSetSourceSoundProperties(const am_Handl *this, "ackSetSourceSoundProperties", "(iq)i", - handle, error, + handle, error, callStatus ); } @@ -245,7 +234,7 @@ void RoutingControlObserverDBusProxy::ackSetSourceSoundProperty(const am_Handle_ *this, "ackSetSourceSoundProperty", "(iq)i", - handle, error, + handle, error, callStatus ); } @@ -267,7 +256,7 @@ void RoutingControlObserverDBusProxy::ackCrossFading(const am_Handle_s& handle, *this, "ackCrossFading", "(iq)ii", - handle, hotSink, error, + handle, hotSink, error, callStatus ); } @@ -290,7 +279,7 @@ void RoutingControlObserverDBusProxy::ackSourceVolumeTick(const am_Handle_s& han *this, "ackSourceVolumeTick", "(iq)qn", - handle, sourceID, volume, + handle, sourceID, volume, callStatus ); } @@ -313,7 +302,7 @@ void RoutingControlObserverDBusProxy::ackSinkVolumeTick(const am_Handle_s& handl *this, "ackSinkVolumeTick", "(iq)qn", - handle, sinkID, volume, + handle, sinkID, volume, callStatus ); } @@ -340,7 +329,7 @@ void RoutingControlObserverDBusProxy::peekDomain(const std::string& name, Common *this, "peekDomain", "s", - name, + name, callStatus , domainID, error); } @@ -364,7 +353,7 @@ void RoutingControlObserverDBusProxy::registerDomain(const am_Domain_s& domainDa *this, "registerDomain", "(qsssbbi)ss", - domainData, returnBusname, returnInterface, + domainData, returnBusname, returnInterface, callStatus , domainID, error); } @@ -389,7 +378,7 @@ void RoutingControlObserverDBusProxy::deregisterDomain(const am_domainID_t& doma *this, "deregisterDomain", "q", - domainID, + domainID, callStatus , error); } @@ -412,7 +401,7 @@ void RoutingControlObserverDBusProxy::registerGateway(const am_Gateway_s& gatewa *this, "registerGateway", "(qsqqqqqaqaqab)", - gatewayData, + gatewayData, callStatus , gatewayID, error); } @@ -437,7 +426,7 @@ void RoutingControlObserverDBusProxy::deregisterGateway(const am_gatewayID_t& ga *this, "deregisterGateway", "q", - gatewayID, + gatewayID, callStatus , error); } @@ -464,7 +453,7 @@ void RoutingControlObserverDBusProxy::peekSink(const std::string& name, CommonAP *this, "peekSink", "s", - name, + name, callStatus , sinkID, error); } @@ -489,7 +478,7 @@ void RoutingControlObserverDBusProxy::registerSink(const am_Sink_s& sinkData, Co *this, "registerSink", "(qsqqnb(iq)ina(qn)aqa(qn)a(qin)a(qin))", - sinkData, + sinkData, callStatus , sinkID, error); } @@ -513,7 +502,7 @@ void RoutingControlObserverDBusProxy::deregisterSink(const am_sinkID_t& sinkID, *this, "deregisterSink", "q", - sinkID, + sinkID, callStatus , error); } @@ -540,7 +529,7 @@ void RoutingControlObserverDBusProxy::peekSource(const std::string& name, Common *this, "peekSource", "s", - name, + name, callStatus , sourceID, error); } @@ -566,7 +555,7 @@ void RoutingControlObserverDBusProxy::registerSource(const am_Source_s& sourceDa *this, "registerSource", "(qqsqinb(iq)ia(qn)aqa(qn)a(qin)a(qin))", - sourceData, + sourceData, callStatus , sourceID, error); } @@ -590,7 +579,7 @@ void RoutingControlObserverDBusProxy::deregisterSource(const am_sourceID_t& sour *this, "deregisterSource", "q", - sourceID, + sourceID, callStatus , error); } @@ -614,7 +603,7 @@ void RoutingControlObserverDBusProxy::registerCrossfader(const am_Crossfader_s& *this, "registerCrossfader", "(qsqqqi)", - crossfaderData, + crossfaderData, callStatus , crossfaderID, error); } @@ -639,7 +628,7 @@ void RoutingControlObserverDBusProxy::deregisterCrossfader(const am_crossfaderID *this, "deregisterCrossfader", "q", - crossfaderID, + crossfaderID, callStatus , error); } @@ -664,7 +653,7 @@ void RoutingControlObserverDBusProxy::peekSourceClassID(const std::string& name, *this, "peekSourceClassID", "s", - name, + name, callStatus , sourceClassID, error); } @@ -689,7 +678,7 @@ void RoutingControlObserverDBusProxy::peekSinkClassID(const std::string& name, C *this, "peekSinkClassID", "s", - name, + name, callStatus , sinkClassID, error); } @@ -711,7 +700,7 @@ void RoutingControlObserverDBusProxy::hookInterruptStatusChange(const am_sourceI *this, "hookInterruptStatusChange", "qi", - sourceID, interruptState, + sourceID, interruptState, callStatus ); } @@ -735,7 +724,7 @@ void RoutingControlObserverDBusProxy::hookDomainRegistrationComplete(const am_do *this, "hookDomainRegistrationComplete", "q", - domainID, + domainID, callStatus ); } @@ -757,7 +746,7 @@ void RoutingControlObserverDBusProxy::hookSinkAvailablityStatusChange(const am_s *this, "hookSinkAvailablityStatusChange", "q(iq)", - sinkID, availability, + sinkID, availability, callStatus ); } @@ -779,7 +768,7 @@ void RoutingControlObserverDBusProxy::hookSourceAvailablityStatusChange(const am *this, "hookSourceAvailablityStatusChange", "q(iq)", - sourceID, availability, + sourceID, availability, callStatus ); } @@ -801,7 +790,7 @@ void RoutingControlObserverDBusProxy::hookDomainStateChange(const am_domainID_t& *this, "hookDomainStateChange", "qi", - domainID, domainState, + domainID, domainState, callStatus ); } @@ -823,7 +812,7 @@ void RoutingControlObserverDBusProxy::hookTimingInformationChanged(const am_conn *this, "hookTimingInformationChanged", "qn", - connectionID, delay, + connectionID, delay, callStatus ); } @@ -847,7 +836,7 @@ void RoutingControlObserverDBusProxy::sendChangedData(const am_EarlyData_L& earl *this, "sendChangedData", "a(i(yv)(yv))", - earlyData, + earlyData, callStatus ); } @@ -870,7 +859,7 @@ void RoutingControlObserverDBusProxy::updateGateway(const am_gatewayID_t& gatewa *this, "updateGateway", "qaqaqab", - gatewayID, listSourceFormats, listSinkFormats, convertionMatrix, + gatewayID, listSourceFormats, listSinkFormats, convertionMatrix, callStatus , error); } @@ -893,7 +882,7 @@ void RoutingControlObserverDBusProxy::updateSink(const am_sinkID_t& sinkID, cons *this, "updateSink", "qqa(qn)aqa(qn)", - sinkID, sinkClassID, listSoundProperties, listConnectionFormats, listMainSoundProperties, + sinkID, sinkClassID, listSoundProperties, listConnectionFormats, listMainSoundProperties, callStatus , error); } @@ -924,7 +913,7 @@ void RoutingControlObserverDBusProxy::updateSource(const am_sourceID_t& sourceID *this, "updateSource", "qqa(qn)aqa(qn)", - sourceID, sourceClassID, listSoundProperties, listConnectionFormats, listMainSoundProperties, + sourceID, sourceClassID, listSoundProperties, listConnectionFormats, listMainSoundProperties, callStatus , error); } @@ -946,7 +935,7 @@ void RoutingControlObserverDBusProxy::ackSetVolumes(const am_Handle_s& handle, c *this, "ackSetVolumes", "(iq)a(i(yv)nqn)i", - handle, listvolumes, error, + handle, listvolumes, error, callStatus ); } @@ -968,7 +957,7 @@ void RoutingControlObserverDBusProxy::ackSinkNotificationConfiguration(const am_ *this, "ackSinkNotificationConfiguration", "(iq)i", - handle, error, + handle, error, callStatus ); } @@ -990,7 +979,7 @@ void RoutingControlObserverDBusProxy::ackSourceNotificationConfiguration(const a *this, "ackSourceNotificationConfiguration", "(iq)i", - handle, error, + handle, error, callStatus ); } @@ -1012,7 +1001,7 @@ void RoutingControlObserverDBusProxy::hookSinkNotificationDataChange(const am_si *this, "hookSinkNotificationDataChange", "q(qn)", - sinkID, payload, + sinkID, payload, callStatus ); } @@ -1034,7 +1023,7 @@ void RoutingControlObserverDBusProxy::hookSourceNotificationDataChange(const am_ *this, "hookSourceNotificationDataChange", "q(qn)", - sourceID, payload, + sourceID, payload, callStatus ); } @@ -1053,7 +1042,7 @@ void RoutingControlObserverDBusProxy::confirmRoutingRundown(const std::string& d *this, "confirmRoutingRundown", "s", - domainName, + domainName, callStatus ); } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h index e0f2460..81d8885 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * Routing Receive sendInterface description. @@ -333,14 +322,14 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx virtual std::future<CommonAPI::CallStatus> hookSourceNotificationDataChangeAsync(const am_sourceID_t& sourceID, const am_NotificationPayload_s& payload, HookSourceNotificationDataChangeAsyncCallback callback); virtual void confirmRoutingRundown(const std::string& domainName, CommonAPI::CallStatus& callStatus); virtual std::future<CommonAPI::CallStatus> confirmRoutingRundownAsync(const std::string& domainName, ConfirmRoutingRundownAsyncCallback callback); - + virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const; private: CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusReadonlyAttribute<RoutingReadyAttribute>> routingReady_; - + }; diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp index becdca1..4c8053d 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ #include "RoutingControlObserverDBusStubAdapter.h" #include <org/genivi/am/RoutingControlObserver.h> @@ -41,31 +30,21 @@ __attribute__((constructor)) void registerRoutingControlObserverDBusStubAdapter( &createRoutingControlObserverDBusStubAdapter); } -RoutingControlObserverDBusStubAdapter::RoutingControlObserverDBusStubAdapter( - const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, - const std::string& commonApiAddress, - const std::string& dbusInterfaceName, - const std::string& dbusBusName, - const std::string& dbusObjectPath, - const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection, - const std::shared_ptr<CommonAPI::StubBase>& stub): - RoutingControlObserverDBusStubAdapterHelper(factory, commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, - dbusConnection, std::dynamic_pointer_cast<RoutingControlObserverStub>(stub), - NULL) - { -} -RoutingControlObserverDBusStubAdapter::~RoutingControlObserverDBusStubAdapter() { + +RoutingControlObserverDBusStubAdapterInternal::~RoutingControlObserverDBusStubAdapterInternal() { deactivateManagedInstances(); - deinit(); - stub_.reset(); + RoutingControlObserverDBusStubAdapterHelper::deinit(); } -void RoutingControlObserverDBusStubAdapter::deactivateManagedInstances() { +void RoutingControlObserverDBusStubAdapterInternal::deactivateManagedInstances() { } -const char* RoutingControlObserverDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const { - static const char* introspectionData = +const char* RoutingControlObserverDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { + static const std::string introspectionData = + "<method name=\"getInterfaceVersion\">\n" + "<arg name=\"value\" type=\"uu\" direction=\"out\" />" + "</method>\n" "<method name=\"getRoutingReadyAttribute\">\n" "<arg name=\"value\" type=\"i\" direction=\"out\" />" "</method>\n" @@ -461,10 +440,15 @@ const char* RoutingControlObserverDBusStubAdapter::getMethodsDBusIntrospectionXm "<method name=\"confirmRoutingRundown\">\n" "<arg name=\"domainName\" type=\"s\" direction=\"in\" />\n" "</method>\n" + ; - return introspectionData; + return introspectionData.c_str(); } +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + RoutingControlObserverStub, + CommonAPI::Version + > getRoutingControlObserverInterfaceVersionStubDispatcher(&RoutingControlObserverStub::getInterfaceVersion, "uu"); /** * This attribute signals to the clients the current routing state. @@ -889,7 +873,7 @@ A client * should notify himself to this attribute in order to know the current state and * act accordingly. */ -void RoutingControlObserverDBusStubAdapter::fireRoutingReadyAttributeChanged(const am_RoutingReady_e& value) { +void RoutingControlObserverDBusStubAdapterInternal::fireRoutingReadyAttributeChanged(const am_RoutingReady_e& value) { CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<am_RoutingReady_e>> ::sendSignal( *this, @@ -900,8 +884,37 @@ void RoutingControlObserverDBusStubAdapter::fireRoutingReadyAttributeChanged(con } -const RoutingControlObserverDBusStubAdapter::StubDispatcherTable& RoutingControlObserverDBusStubAdapter::getStubDispatcherTable() { - static const RoutingControlObserverDBusStubAdapter::StubDispatcherTable stubDispatcherTable = { +const RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable& RoutingControlObserverDBusStubAdapterInternal::getStubDispatcherTable() { + return stubDispatcherTable_; +} + + +RoutingControlObserverDBusStubAdapterInternal::RoutingControlObserverDBusStubAdapterInternal( + const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, + const std::string& commonApiAddress, + const std::string& dbusInterfaceName, + const std::string& dbusBusName, + const std::string& dbusObjectPath, + const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection, + const std::shared_ptr<CommonAPI::StubBase>& stub): + CommonAPI::DBus::DBusStubAdapter( + factory, + commonApiAddress, + dbusInterfaceName, + dbusBusName, + dbusObjectPath, + dbusConnection, + false), + RoutingControlObserverDBusStubAdapterHelper( + factory, + commonApiAddress, + dbusInterfaceName, + dbusBusName, + dbusObjectPath, + dbusConnection, + std::dynamic_pointer_cast<RoutingControlObserverStub>(stub), + false), + stubDispatcherTable_({ /** * This attribute signals to the clients the current routing state. A client @@ -1142,10 +1155,10 @@ const RoutingControlObserverDBusStubAdapter::StubDispatcherTable& RoutingControl */ { { "hookSourceNotificationDataChange", "q(qn)" }, &org::genivi::am::hookSourceNotificationDataChangeStubDispatcher }, { { "confirmRoutingRundown", "s" }, &org::genivi::am::confirmRoutingRundownStubDispatcher } - }; - return stubDispatcherTable; -} + }) { + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::am::getRoutingControlObserverInterfaceVersionStubDispatcher }); +} } // namespace am } // namespace genivi diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h index a1ba0c6..144e86a 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * Routing Receive sendInterface description. @@ -44,9 +33,9 @@ namespace am { typedef CommonAPI::DBus::DBusStubAdapterHelper<RoutingControlObserverStub> RoutingControlObserverDBusStubAdapterHelper; -class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverStubAdapter, public RoutingControlObserverDBusStubAdapterHelper { +class RoutingControlObserverDBusStubAdapterInternal: public RoutingControlObserverStubAdapter, public RoutingControlObserverDBusStubAdapterHelper { public: - RoutingControlObserverDBusStubAdapter( + RoutingControlObserverDBusStubAdapterInternal( const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, const std::string& commonApiAddress, const std::string& dbusInterfaceName, @@ -55,7 +44,7 @@ class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverStubAd const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection, const std::shared_ptr<CommonAPI::StubBase>& stub); - ~RoutingControlObserverDBusStubAdapter(); + ~RoutingControlObserverDBusStubAdapterInternal(); /** * This attribute signals to the clients the current routing state. @@ -65,16 +54,46 @@ class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverStubAd */ void fireRoutingReadyAttributeChanged(const am_RoutingReady_e& value); - - const StubDispatcherTable& getStubDispatcherTable(); - + + const RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + void deactivateManagedInstances(); + protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; private: + RoutingControlObserverDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; +}; + +class RoutingControlObserverDBusStubAdapter: public RoutingControlObserverDBusStubAdapterInternal, public std::enable_shared_from_this<RoutingControlObserverDBusStubAdapter> { +public: + RoutingControlObserverDBusStubAdapter( + const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory, + const std::string& commonApiAddress, + const std::string& dbusInterfaceName, + const std::string& dbusBusName, + const std::string& dbusObjectPath, + const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection, + const std::shared_ptr<CommonAPI::StubBase>& stub) : + CommonAPI::DBus::DBusStubAdapter( + factory, + commonApiAddress, + dbusInterfaceName, + dbusBusName, + dbusObjectPath, + dbusConnection, + false), + RoutingControlObserverDBusStubAdapterInternal( + factory, + commonApiAddress, + dbusInterfaceName, + dbusBusName, + dbusObjectPath, + dbusConnection, + stub) { } }; } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h index 242dcf6..998e8ae 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * Routing Receive sendInterface description. @@ -27,6 +16,7 @@ #include "RoutingControlObserverProxyBase.h" + #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION #endif @@ -41,11 +31,15 @@ namespace genivi { namespace am { template <typename ... _AttributeExtensions> -class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtual public RoutingControlObserverProxyBase, public _AttributeExtensions... { - public: +class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtual public RoutingControlObserverProxyBase +, public _AttributeExtensions... { +public: RoutingControlObserverProxy(std::shared_ptr<CommonAPI::Proxy> delegate); ~RoutingControlObserverProxy(); + typedef RoutingControlObserver InterfaceType; + + /** * This attribute signals to the clients the current routing state. A client @@ -1085,7 +1079,7 @@ class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtua * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future<CommonAPI::CallStatus> confirmRoutingRundownAsync(const std::string& domainName, ConfirmRoutingRundownAsyncCallback callback); - + /** * Returns the CommonAPI address of the remote partner this proxy communicates with. @@ -1791,7 +1785,6 @@ CommonAPI::InterfaceVersionAttribute& RoutingControlObserverProxy<_AttributeExte return delegate_->getInterfaceVersionAttribute(); } - } // namespace am } // namespace genivi diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h index d222d40..fa80989 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * Routing Receive sendInterface description. diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h index 643b5d5..eb61414 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * Routing Receive sendInterface description. @@ -61,10 +50,9 @@ class RoutingControlObserverStubAdapter: virtual public CommonAPI::StubAdapter, ///Notifies all remote listeners about a change of value of the attribute RoutingReady. virtual void fireRoutingReadyAttributeChanged(const am_RoutingReady_e& RoutingReady) = 0; - - + + virtual void deactivateManagedInstances() = 0; - protected: /** * Defines properties for storing the ClientIds of clients / proxies that have @@ -99,9 +87,10 @@ 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 CommonAPI::Stub<RoutingControlObserverStubAdapter , RoutingControlObserverStubRemoteEvent> { - public: +class RoutingControlObserverStub : public virtual CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent> { +public: virtual ~RoutingControlObserverStub() { } + virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; /** * This attribute signals to the clients the current routing state. @@ -387,7 +376,10 @@ class RoutingControlObserverStub : public CommonAPI::Stub<RoutingControlObserver virtual void hookSourceNotificationDataChange(const std::shared_ptr<CommonAPI::ClientId> clientId, am_sourceID_t sourceID, am_NotificationPayload_s payload) = 0; /// This is the method that will be called on remote calls on the method confirmRoutingRundown. virtual void confirmRoutingRundown(const std::shared_ptr<CommonAPI::ClientId> clientId, std::string domainName) = 0; - + + using CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::initStubAdapter; + typedef CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::StubAdapterType StubAdapterType; + typedef CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; }; } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp index 7e0145f..46d10f7 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ #include <org/genivi/am/RoutingControlObserverStubDefault.h> @@ -25,11 +14,16 @@ namespace genivi { namespace am { RoutingControlObserverStubDefault::RoutingControlObserverStubDefault(): - remoteEventHandler_(this) { + remoteEventHandler_(this), + interfaceVersion_(RoutingControlObserver::getInterfaceVersion()) { +} + +const CommonAPI::Version& RoutingControlObserverStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) { + return interfaceVersion_; } RoutingControlObserverStubRemoteEvent* RoutingControlObserverStubDefault::initStubAdapter(const std::shared_ptr<RoutingControlObserverStubAdapter>& stubAdapter) { - stubAdapter_ = stubAdapter; + CommonAPI::Stub<RoutingControlObserverStubAdapter, RoutingControlObserverStubRemoteEvent>::stubAdapter_ = stubAdapter; return &remoteEventHandler_; } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h index 69eb2ce..0d19077 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * Routing Receive sendInterface description. @@ -25,6 +14,7 @@ #ifndef ORG_GENIVI_AM_Routing_Control_Observer_STUB_DEFAULT_H_ #define ORG_GENIVI_AM_Routing_Control_Observer_STUB_DEFAULT_H_ + #include <org/genivi/am/RoutingControlObserverStub.h> #include <sstream> @@ -42,12 +32,14 @@ namespace am { * that would be defined for this service, and/or if you do not need any non-default * behaviour. */ -class RoutingControlObserverStubDefault : public RoutingControlObserverStub { - public: +class RoutingControlObserverStubDefault : public virtual RoutingControlObserverStub { +public: RoutingControlObserverStubDefault(); RoutingControlObserverStubRemoteEvent* initStubAdapter(const std::shared_ptr<RoutingControlObserverStubAdapter>& stubAdapter); + const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId); + virtual const am_RoutingReady_e& getRoutingReadyAttribute(); virtual const am_RoutingReady_e& getRoutingReadyAttribute(const std::shared_ptr<CommonAPI::ClientId> clientId); virtual void setRoutingReadyAttribute(am_RoutingReady_e value); @@ -371,9 +363,9 @@ class RoutingControlObserverStubDefault : public RoutingControlObserverStub { virtual void confirmRoutingRundown(std::string domainName); - - protected: + +protected: /** * This attribute signals to the clients the current routing state. A client @@ -382,8 +374,7 @@ class RoutingControlObserverStubDefault : public RoutingControlObserverStub { */ virtual bool trySetRoutingReadyAttribute(am_RoutingReady_e value); virtual bool validateRoutingReadyAttributeRequestedValue(const am_RoutingReady_e& value); - std::shared_ptr<RoutingControlObserverStubAdapter> stubAdapter_; - private: +private: class RemoteEventHandler: public RoutingControlObserverStubRemoteEvent { public: RemoteEventHandler(RoutingControlObserverStubDefault* defaultStub); @@ -409,6 +400,8 @@ class RoutingControlObserverStubDefault : public RoutingControlObserverStub { * act accordingly. */ am_RoutingReady_e routingReadyAttributeValue_; + + CommonAPI::Version interfaceVersion_; }; } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h index bc0db84..4cc1ba0 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * This class implements everything from Audiomanager -> RoutingAdapter @@ -27,6 +16,7 @@ #include "RoutingControlProxyBase.h" + #if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION #endif @@ -39,11 +29,15 @@ namespace genivi { namespace am { template <typename ... _AttributeExtensions> -class RoutingControlProxy: virtual public RoutingControl, virtual public RoutingControlProxyBase, public _AttributeExtensions... { - public: +class RoutingControlProxy: virtual public RoutingControl, virtual public RoutingControlProxyBase +, public _AttributeExtensions... { +public: RoutingControlProxy(std::shared_ptr<CommonAPI::Proxy> delegate); ~RoutingControlProxy(); + typedef RoutingControl InterfaceType; + + /** @@ -73,7 +67,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing /** * 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 + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t does not match * * Calls asyncConnect with synchronous semantics. * @@ -82,7 +76,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. */ - 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_ConnectionFormat_pe& connectionFormat, CommonAPI::CallStatus& callStatus); + 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); /** * Calls asyncConnect with asynchronous semantics. * @@ -93,7 +87,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing * 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> asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback); + 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); /** * disconnect a connection with given connectionID (at)return E_OK on success, @@ -132,7 +126,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. */ - virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus); + virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus); /** * Calls asyncSetSinkVolume with asynchronous semantics. * @@ -143,7 +137,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing * 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> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback); + virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback); /** * 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 @@ -160,7 +154,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. */ - virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus); + virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus); /** * Calls asyncSetSourceVolume with asynchronous semantics. * @@ -171,7 +165,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing * 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> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback); + virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback); /** * This function is used to set the source state of a particular * source. @@ -304,7 +298,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. */ - virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus); + virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus); /** * Calls asyncCrossFade with asynchronous semantics. * @@ -315,7 +309,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing * 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> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback); + virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback); /** * this function is used for early and late audio functions to set the domain * state @@ -401,7 +395,7 @@ class RoutingControlProxy: virtual public RoutingControl, virtual public Routing * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future<CommonAPI::CallStatus> asyncSetSourceNotificationConfigurationAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_NotificationConfiguration_s& notificationConfiguration, AsyncSetSourceNotificationConfigurationAsyncCallback callback); - + /** * Returns the CommonAPI address of the remote partner this proxy communicates with. @@ -480,15 +474,15 @@ 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_ConnectionFormat_e does not match + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t 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_ConnectionFormat_pe& connectionFormat, CommonAPI::CallStatus& callStatus) { +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) { delegate_->asyncConnect(handle, connectionID, sourceID, sinkID, connectionFormat, callStatus); } template <typename ... _AttributeExtensions> -std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncConnectAsync(const am_Handle_s& handle, const am_connectionID_t& connectionID, const am_sourceID_t& sourceID, const am_sinkID_t& sinkID, const am_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback) { +std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::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) { return delegate_->asyncConnectAsync(handle, connectionID, sourceID, sinkID, connectionFormat, callback); } /** @@ -513,12 +507,12 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>: * E_OUT_OF_RANGE if new volume is out of range */ template <typename ... _AttributeExtensions> -void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) { +void RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) { delegate_->asyncSetSinkVolume(handle, sinkID, volume, ramp, time, callStatus); } template <typename ... _AttributeExtensions> -std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) { +std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) { return delegate_->asyncSetSinkVolumeAsync(handle, sinkID, volume, ramp, time, callback); } /** @@ -531,12 +525,12 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>: triggers the acknowledge ackSourceVolumeChange */ template <typename ... _AttributeExtensions> -void RoutingControlProxy<_AttributeExtensions...>::asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) { +void RoutingControlProxy<_AttributeExtensions...>::asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) { delegate_->asyncSetSourceVolume(handle, sourceID, volume, ramp, time, callStatus); } template <typename ... _AttributeExtensions> -std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) { +std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) { return delegate_->asyncSetSourceVolumeAsync(handle, sourceID, volume, ramp, time, callback); } /** @@ -615,12 +609,12 @@ std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>: * error */ template <typename ... _AttributeExtensions> -void RoutingControlProxy<_AttributeExtensions...>::asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) { +void RoutingControlProxy<_AttributeExtensions...>::asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) { delegate_->asyncCrossFade(handle, crossfaderID, hotSink, rampType, time, callStatus); } template <typename ... _AttributeExtensions> -std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) { +std::future<CommonAPI::CallStatus> RoutingControlProxy<_AttributeExtensions...>::asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) { return delegate_->asyncCrossFadeAsync(handle, crossfaderID, hotSink, rampType, time, callback); } /** @@ -705,7 +699,6 @@ CommonAPI::InterfaceVersionAttribute& RoutingControlProxy<_AttributeExtensions.. return delegate_->getInterfaceVersionAttribute(); } - } // namespace am } // namespace genivi diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h index f24ef2a..75bba47 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * This class implements everything from Audiomanager -> RoutingAdapter @@ -81,10 +70,10 @@ 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_ConnectionFormat_e does not match + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t 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_ConnectionFormat_pe& 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_ConnectionFormat_pe& connectionFormat, AsyncConnectAsyncCallback callback) = 0; + 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; /** * disconnect a connection with given connectionID (at)return E_OK on success, @@ -99,8 +88,8 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy { (at)return E_OK on success, E_UNKNOWN on error, * E_OUT_OF_RANGE if new volume is out of range */ - virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0; - virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) = 0; + virtual void asyncSetSinkVolume(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0; + virtual std::future<CommonAPI::CallStatus> asyncSetSinkVolumeAsync(const am_Handle_s& handle, const am_sinkID_t& sinkID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSinkVolumeAsyncCallback callback) = 0; /** * 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 @@ -110,8 +99,8 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy { * range. triggers the acknowledge ackSourceVolumeChange */ - virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0; - virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_RampType_pe& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) = 0; + virtual void asyncSetSourceVolume(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0; + virtual std::future<CommonAPI::CallStatus> asyncSetSourceVolumeAsync(const am_Handle_s& handle, const am_sourceID_t& sourceID, const am_volume_t& volume, const am_CustomRampType_t& ramp, const am_time_t& time, AsyncSetSourceVolumeAsyncCallback callback) = 0; /** * This function is used to set the source state of a particular * source. @@ -152,8 +141,8 @@ class RoutingControlProxyBase: virtual public CommonAPI::Proxy { (at)return E_OK on success, E_UNKNOWN on * error */ - virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0; - virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_RampType_pe& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) = 0; + virtual void asyncCrossFade(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, CommonAPI::CallStatus& callStatus) = 0; + virtual std::future<CommonAPI::CallStatus> asyncCrossFadeAsync(const am_Handle_s& handle, const am_crossfaderID_t& crossfaderID, const am_HotSink_e& hotSink, const am_CustomRampType_t& rampType, const am_time_t& time, AsyncCrossFadeAsyncCallback callback) = 0; /** * this function is used for early and late audio functions to set the domain * state diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h index 5458089..5303589 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * This class implements everything from Audiomanager -> RoutingAdapter @@ -58,10 +47,9 @@ namespace am { class RoutingControlStubAdapter: virtual public CommonAPI::StubAdapter, public RoutingControl { public: - - + + virtual void deactivateManagedInstances() = 0; - protected: /** * Defines properties for storing the ClientIds of clients / proxies that have @@ -95,9 +83,10 @@ 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 CommonAPI::Stub<RoutingControlStubAdapter , RoutingControlStubRemoteEvent> { - public: +class RoutingControlStub : public virtual CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent> { +public: virtual ~RoutingControlStub() { } + virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0; /** @@ -110,10 +99,10 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro /** * 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 + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t 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_ConnectionFormat_pe connectionFormat) = 0; + 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; /** * disconnect a connection with given connectionID (at)return E_OK on success, @@ -129,7 +118,7 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro * E_OUT_OF_RANGE if new volume is out of range */ /// This is the method that will be called on remote calls on the method asyncSetSinkVolume. - virtual void asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) = 0; + virtual void asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) = 0; /** * 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 @@ -140,7 +129,7 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro triggers the acknowledge ackSourceVolumeChange */ /// This is the method that will be called on remote calls on the method asyncSetSourceVolume. - virtual void asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) = 0; + virtual void asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) = 0; /** * This function is used to set the source state of a particular * source. @@ -182,7 +171,7 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro * error */ /// This is the method that will be called on remote calls on the method asyncCrossFade. - virtual void asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time) = 0; + virtual void asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time) = 0; /** * this function is used for early and late audio functions to set the domain * state @@ -196,7 +185,10 @@ class RoutingControlStub : public CommonAPI::Stub<RoutingControlStubAdapter , Ro virtual void asyncSetSinkNotificationConfiguration(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_NotificationConfiguration_s notificationConfiguration) = 0; /// This is the method that will be called on remote calls on the method asyncSetSourceNotificationConfiguration. virtual void asyncSetSourceNotificationConfiguration(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_NotificationConfiguration_s notificationConfiguration) = 0; - + + using CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::initStubAdapter; + typedef CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::StubAdapterType StubAdapterType; + typedef CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType; }; } // namespace am diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp index 8a6bdd9..77e34e4 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ #include <org/genivi/am/RoutingControlStubDefault.h> @@ -25,11 +14,16 @@ namespace genivi { namespace am { RoutingControlStubDefault::RoutingControlStubDefault(): - remoteEventHandler_(this) { + remoteEventHandler_(this), + interfaceVersion_(RoutingControl::getInterfaceVersion()) { +} + +const CommonAPI::Version& RoutingControlStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) { + return interfaceVersion_; } RoutingControlStubRemoteEvent* RoutingControlStubDefault::initStubAdapter(const std::shared_ptr<RoutingControlStubAdapter>& stubAdapter) { - stubAdapter_ = stubAdapter; + CommonAPI::Stub<RoutingControlStubAdapter, RoutingControlStubRemoteEvent>::stubAdapter_ = stubAdapter; return &remoteEventHandler_; } @@ -50,13 +44,13 @@ 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_ConnectionFormat_e does not match + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t 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_ConnectionFormat_pe connectionFormat) { +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 asyncConnect(handle, connectionID, sourceID, sinkID, connectionFormat); } -void RoutingControlStubDefault::asyncConnect(am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_ConnectionFormat_pe connectionFormat) { +void RoutingControlStubDefault::asyncConnect(am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_CustomConnectionFormat_t connectionFormat) { // No operation in default } @@ -80,11 +74,11 @@ void RoutingControlStubDefault::asyncDisconnect(am_Handle_s handle, am_connectio (at)return E_OK on success, E_UNKNOWN on error, * E_OUT_OF_RANGE if new volume is out of range */ -void RoutingControlStubDefault::asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) { +void RoutingControlStubDefault::asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) { // Call old style methods in default asyncSetSinkVolume(handle, sinkID, volume, ramp, time); } -void RoutingControlStubDefault::asyncSetSinkVolume(am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) { +void RoutingControlStubDefault::asyncSetSinkVolume(am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) { // No operation in default } @@ -97,11 +91,11 @@ void RoutingControlStubDefault::asyncSetSinkVolume(am_Handle_s handle, am_sinkID * range. triggers the acknowledge ackSourceVolumeChange */ -void RoutingControlStubDefault::asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) { +void RoutingControlStubDefault::asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) { // Call old style methods in default asyncSetSourceVolume(handle, sourceID, volume, ramp, time); } -void RoutingControlStubDefault::asyncSetSourceVolume(am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time) { +void RoutingControlStubDefault::asyncSetSourceVolume(am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time) { // No operation in default } @@ -175,11 +169,11 @@ void RoutingControlStubDefault::asyncSetSourceSoundProperty(am_Handle_s handle, (at)return E_OK on success, E_UNKNOWN on * error */ -void RoutingControlStubDefault::asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time) { +void RoutingControlStubDefault::asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time) { // Call old style methods in default asyncCrossFade(handle, crossfaderID, hotSink, rampType, time); } -void RoutingControlStubDefault::asyncCrossFade(am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time) { +void RoutingControlStubDefault::asyncCrossFade(am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time) { // No operation in default } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h index 82f4c40..f411112 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h @@ -1,22 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 2.1.2.201309301424. -* Used org.franca.core 0.8.9.201308271211. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.5.201312121915. +* Used org.franca.core 0.8.11.201401091023. * -* Copyright (c) 2012 BMW -* -* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 -* -* \copyright -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, -* including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -* THE USE OR OTHER DEALINGS IN THE SOFTWARE. -* For further information see http://www.genivi.org/. -* +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ /** * This class implements everything from Audiomanager -> RoutingAdapter @@ -25,6 +14,7 @@ #ifndef ORG_GENIVI_AM_Routing_Control_STUB_DEFAULT_H_ #define ORG_GENIVI_AM_Routing_Control_STUB_DEFAULT_H_ + #include <org/genivi/am/RoutingControlStub.h> #include <sstream> @@ -42,12 +32,14 @@ namespace am { * that would be defined for this service, and/or if you do not need any non-default * behaviour. */ -class RoutingControlStubDefault : public RoutingControlStub { - public: +class RoutingControlStubDefault : public virtual RoutingControlStub { +public: RoutingControlStubDefault(); RoutingControlStubRemoteEvent* initStubAdapter(const std::shared_ptr<RoutingControlStubAdapter>& stubAdapter); + const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId); + /** * aborts an asynchronous action. @@ -60,10 +52,10 @@ class RoutingControlStubDefault : public RoutingControlStub { /** * 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 + * E_WRONG_FORMAT in case am_CustomConnectionFormat_t 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_ConnectionFormat_pe connectionFormat); - virtual void asyncConnect(am_Handle_s handle, am_connectionID_t connectionID, am_sourceID_t sourceID, am_sinkID_t sinkID, am_ConnectionFormat_pe connectionFormat); + 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); /** * disconnect a connection with given connectionID @@ -80,8 +72,8 @@ class RoutingControlStubDefault : public RoutingControlStub { (at)return E_OK on success, E_UNKNOWN on error, * E_OUT_OF_RANGE if new volume is out of range */ - virtual void asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time); - virtual void asyncSetSinkVolume(am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_RampType_pe ramp, am_time_t time); + virtual void asyncSetSinkVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time); + virtual void asyncSetSinkVolume(am_Handle_s handle, am_sinkID_t sinkID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time); /** * sets the volume of a source. This method is used to set the volume of a sink. @@ -92,8 +84,8 @@ class RoutingControlStubDefault : public RoutingControlStub { * range. triggers the acknowledge ackSourceVolumeChange */ - virtual void asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time); - virtual void asyncSetSourceVolume(am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_RampType_pe ramp, am_time_t time); + virtual void asyncSetSourceVolume(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time); + virtual void asyncSetSourceVolume(am_Handle_s handle, am_sourceID_t sourceID, am_volume_t volume, am_CustomRampType_t ramp, am_time_t time); /** * This function is used to set the source state of a particular @@ -140,8 +132,8 @@ class RoutingControlStubDefault : public RoutingControlStub { (at)return E_OK on success, E_UNKNOWN on * error */ - virtual void asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time); - virtual void asyncCrossFade(am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_RampType_pe rampType, am_time_t time); + virtual void asyncCrossFade(const std::shared_ptr<CommonAPI::ClientId> clientId, am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time); + virtual void asyncCrossFade(am_Handle_s handle, am_crossfaderID_t crossfaderID, am_HotSink_e hotSink, am_CustomRampType_t rampType, am_time_t time); /** * this function is used for early and late audio functions to set the domain @@ -161,11 +153,10 @@ class RoutingControlStubDefault : public RoutingControlStub { virtual void asyncSetSourceNotificationConfiguration(am_Handle_s handle, am_sourceID_t sourceID, am_NotificationConfiguration_s notificationConfiguration); - - protected: - std::shared_ptr<RoutingControlStubAdapter> stubAdapter_; - private: + +protected: +private: class RemoteEventHandler: public RoutingControlStubRemoteEvent { public: RemoteEventHandler(RoutingControlStubDefault* defaultStub); @@ -177,6 +168,8 @@ class RoutingControlStubDefault : public RoutingControlStub { RemoteEventHandler remoteEventHandler_; + + CommonAPI::Version interfaceVersion_; }; } // namespace am |