From 32caf7f1db12965712a1f74016e7b55e258cab73 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Wed, 25 Sep 2013 15:42:47 +0200 Subject: * made sure that CommonAPI stuff compiles with release 2.1 Signed-off-by: Christian Linke --- .../genivi/NodeStateManager/ConsumerDBusProxy.cpp | 46 +++++++++++++++------- 1 file changed, 32 insertions(+), 14 deletions(-) (limited to 'AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp') diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp index 202680d..b61fde5 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp @@ -1,10 +1,24 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \copyright +* 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 Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #include "ConsumerDBusProxy.h" namespace org { @@ -12,12 +26,13 @@ namespace genivi { namespace NodeStateManager { std::shared_ptr createConsumerDBusProxy( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& interfaceName, const std::string& busName, const std::string& objectPath, const std::shared_ptr& dbusProxyConnection) { - return std::make_shared(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); + return std::make_shared(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } __attribute__((constructor)) void registerConsumerDBusProxy(void) { @@ -26,21 +41,22 @@ __attribute__((constructor)) void registerConsumerDBusProxy(void) { } ConsumerDBusProxy::ConsumerDBusProxy( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& interfaceName, const std::string& busName, const std::string& objectPath, const std::shared_ptr& dbusProxyconnection): - CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection) -, bootMode_(*this, interfaceName.c_str(), "BootMode"), - restartReason_(*this, interfaceName.c_str(), "RestartReason"), - shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"), - wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason") + CommonAPI::DBus::DBusProxy(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection) +,bootMode_(*this, interfaceName.c_str(), "BootMode"), +restartReason_(*this, interfaceName.c_str(), "RestartReason"), +shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"), +wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason") , nodeApplicationMode_(*this, "NodeApplicationMode", "i"), - sessionStateChanged_(*this, "SessionStateChanged", "sii"), - nodeState_(*this, "NodeState", "i") - { -} + sessionStateChanged_(*this, "SessionStateChanged", "sii"), + nodeState_(*this, "NodeState", "i") + { + } ConsumerDBusProxy::BootModeAttribute& ConsumerDBusProxy::getBootModeAttribute() { return bootMode_; @@ -267,6 +283,8 @@ std::future ConsumerDBusProxy::SetSessionStateAsync(const std::move(callback)); } + + void ConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { ownVersionMajor = 1; ownVersionMinor = 0; -- cgit v1.2.1