summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AudioManagerDaemon/docx/04_components.dox14
-rw-r--r--AudioManagerDaemon/docx/04_d_commonAPI.dox30
-rw-r--r--AudioManagerDaemon/docx/14_z_nodeStateManagement.dox2
-rw-r--r--AudioManagerDaemon/docx/16_readme.dox2
-rw-r--r--AudioManagerDaemon/docx/Doxyfile.in2
-rw-r--r--AudioManagerDaemon/docx/images/PluginCommandInterfaceCAPI.pngbin0 -> 114519 bytes
-rw-r--r--AudioManagerDaemon/docx/images/PluginRoutingInterfaceCAPI.pngbin0 -> 167624 bytes
-rw-r--r--AudioManagerDaemon/docx/images/Register_Domain.pngbin0 -> 17905 bytes
-rwxr-xr-xAudioManagerDaemon/docx/images/daemon_insight.pngbin50992 -> 64057 bytes
-rw-r--r--[-rwxr-xr-x]AudioManagerDaemon/docx/images/dependencies.pngbin34175 -> 38376 bytes
-rw-r--r--AudioManagerDaemon/docx/images/dependencies_test.pngbin55504 -> 59908 bytes
-rwxr-xr-xCMakeLists.txt1
-rw-r--r--PluginCommandInterfaceCAPI/fidl/CommandInterface.fidl7
-rw-r--r--PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf4
-rw-r--r--PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h2
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp24
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h24
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h24
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp32
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h26
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp30
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h24
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h30
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h28
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h26
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp26
-rw-r--r--PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h26
-rw-r--r--PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp2
-rw-r--r--PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp2
-rwxr-xr-xPluginRoutingInterfaceCAPI/fidl/PluginRoutingInterfaceCAPI_dbus.conf4
-rw-r--r--PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl2
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp24
-rw-r--r--PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h24
-rwxr-xr-xREADME28
-rw-r--r--README.html30
-rw-r--r--exampleCode/player/Makefile336
-rw-r--r--exampleCode/player/README5
-rw-r--r--exampleCode/player/audiomanagerinteractor.cpp77
-rw-r--r--exampleCode/player/audiomanagerinteractor.h76
-rwxr-xr-xexampleCode/player/audiomanagertypes.h1243
-rw-r--r--exampleCode/player/dbushandler.cpp742
-rw-r--r--exampleCode/player/dbushandler.h103
-rw-r--r--exampleCode/player/images/screen.pngbin4358 -> 0 bytes
-rw-r--r--exampleCode/player/main.cpp98
-rwxr-xr-xexampleCode/player/mainwindow.cpp14
-rwxr-xr-xexampleCode/player/mainwindow.h23
-rwxr-xr-xexampleCode/player/mainwindow.ui24
-rw-r--r--exampleCode/player/mediaplayer.cpp970
-rw-r--r--exampleCode/player/mediaplayer.h164
-rw-r--r--exampleCode/player/mediaplayer.qrc5
-rwxr-xr-xexampleCode/player/player.pro53
-rwxr-xr-xexampleCode/player/player.pro.user365
-rw-r--r--exampleCode/player/settings.ui495
-rw-r--r--src-gen/org/genivi/NodeStateManager/Consumer.h55
-rw-r--r--src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp277
-rw-r--r--src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h99
-rw-r--r--src-gen/org/genivi/NodeStateManager/ConsumerProxy.h604
-rw-r--r--src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h99
-rw-r--r--src-gen/org/genivi/NodeStateManager/ConsumerStub.h147
-rw-r--r--src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp217
-rw-r--r--src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h126
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h55
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp67
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h53
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp67
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h46
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h151
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h43
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h78
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp36
-rw-r--r--src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h59
91 files changed, 828 insertions, 7224 deletions
diff --git a/AudioManagerDaemon/docx/04_components.dox b/AudioManagerDaemon/docx/04_components.dox
index c4084b8..7c8f9b4 100644
--- a/AudioManagerDaemon/docx/04_components.dox
+++ b/AudioManagerDaemon/docx/04_components.dox
@@ -81,5 +81,19 @@
am::IAmRoutingSend::returnBusName. The AudioManagerDaemon used this information to link a plugin with a domain. All other elements like
sinks, sources etc are linked to domains. This is how the hierarchy looks like that is used:
\image html routing_hierarchy.png
+
+ \subsection CAPIplugins CommonAPI plugins
+ As "sample code" with MIT license, PluginCommandInterfaceCAPI and PluginRoutingInterfaceCAPI are provided with the source code. The FRANCA
+ fidls have been generated out of the Enterprise architect model, so they might be used to draw project specific behavior in sequences.
+ The sources in src-gen have been generated out of the provided fidl files.
+
+ \image html PluginCommandInterfaceCAPI.png
+
+ \image html PluginRoutingInterfaceCAPI.png
+
+ There is no fixed domain associated with this plugin. So you have to implement the interface org::genivi::am::RoutingControlStub and report
+ busname and path to the routingplugin on the interface org::genivi::am::RoutingControlObserverStub like this:
+
+ \image html Register_Domain.png
*/
diff --git a/AudioManagerDaemon/docx/04_d_commonAPI.dox b/AudioManagerDaemon/docx/04_d_commonAPI.dox
new file mode 100644
index 0000000..7e837dd
--- /dev/null
+++ b/AudioManagerDaemon/docx/04_d_commonAPI.dox
@@ -0,0 +1,30 @@
+ /*
+ * 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 Christian Linke (christian.linke@bmw.de)
+ *
+ */
+
+ /*!
+ \page comminAPI AudioManager and CommonAPI
+The audiomanager supports CommonAPI in very comfortable way. It will register CommonAPI in the audiomanager mainloop (am::CAmSocketHandler) and make
+threadsafe calls to the stubs registered via the factory provided by the wrapper.
+ If enabled (by default) via cmake, the am::CAmCommonAPIWrapper is created. It is instantiated as singleton
+and every Plugin can use it.
+First, you have to create the interfaces out of the FIDL data like usual.
+Then, you can access the singletons via am::CAmCommonAPIWrapper::factory and am::CAmCommonAPIWrapper::runtime.
+
+More information about CommonAPI can be found here:
+http://projects.genivi.org/commonapi/
+
+*/
diff --git a/AudioManagerDaemon/docx/14_z_nodeStateManagement.dox b/AudioManagerDaemon/docx/14_z_nodeStateManagement.dox
index 216338a..e149310 100644
--- a/AudioManagerDaemon/docx/14_z_nodeStateManagement.dox
+++ b/AudioManagerDaemon/docx/14_z_nodeStateManagement.dox
@@ -21,6 +21,8 @@
The nodestatemanager is part of the GENIVI compliance. It basically handles startup and rundown of components in the IVI context.\n
For more information, please go to http://projects.genivi.org
+The Nodestatemanagement will either work with CommonAPI or DBus native.
+
\section nsmiact The Interaction between the NodeStateManager and the AudioManager
It is the job of am::CAmNodeStateCommunicator to interact with the nodestatemanager via DBUS.\n
The ControllerPlugin can register by the NSM to be informed when a shutdown will occour. For this, the Audiomanager presents an DBus interface, defined in LifeCycleConsumer.xml that will be called from the NSM during a shutdown,
diff --git a/AudioManagerDaemon/docx/16_readme.dox b/AudioManagerDaemon/docx/16_readme.dox
index 9483a68..7798fee 100644
--- a/AudioManagerDaemon/docx/16_readme.dox
+++ b/AudioManagerDaemon/docx/16_readme.dox
@@ -16,5 +16,5 @@
*/
/*!
\page comp Compiling & Co
- <a href=../../README.html>README</a>
+ <a href=README.html>README</a>
*/ \ No newline at end of file
diff --git a/AudioManagerDaemon/docx/Doxyfile.in b/AudioManagerDaemon/docx/Doxyfile.in
index a71d39d..a17e7c6 100644
--- a/AudioManagerDaemon/docx/Doxyfile.in
+++ b/AudioManagerDaemon/docx/Doxyfile.in
@@ -93,7 +93,7 @@ FILE_PATTERNS = *.h *.cpp *.dox
RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS = */test/* */Plugin*/* */build*/* */cmake/* */exampleCode/* */googleMock/* */ProjectSpecific/*
+EXCLUDE_PATTERNS = */test/* */Plugin*DBus*/* */PluginControl*/* */build*/* */cmake/* */exampleCode/* */googleMock/* */ProjectSpecific/*
EXCLUDE_SYMBOLS =
EXAMPLE_PATH = @CMAKE_SOURCE_DIR@
EXAMPLE_PATTERNS =
diff --git a/AudioManagerDaemon/docx/images/PluginCommandInterfaceCAPI.png b/AudioManagerDaemon/docx/images/PluginCommandInterfaceCAPI.png
new file mode 100644
index 0000000..882be93
--- /dev/null
+++ b/AudioManagerDaemon/docx/images/PluginCommandInterfaceCAPI.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/PluginRoutingInterfaceCAPI.png b/AudioManagerDaemon/docx/images/PluginRoutingInterfaceCAPI.png
new file mode 100644
index 0000000..0ae79f5
--- /dev/null
+++ b/AudioManagerDaemon/docx/images/PluginRoutingInterfaceCAPI.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/Register_Domain.png b/AudioManagerDaemon/docx/images/Register_Domain.png
new file mode 100644
index 0000000..09a1251
--- /dev/null
+++ b/AudioManagerDaemon/docx/images/Register_Domain.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/daemon_insight.png b/AudioManagerDaemon/docx/images/daemon_insight.png
index 78c0928..341e3ab 100755
--- a/AudioManagerDaemon/docx/images/daemon_insight.png
+++ b/AudioManagerDaemon/docx/images/daemon_insight.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/dependencies.png b/AudioManagerDaemon/docx/images/dependencies.png
index f5c925d..30d272f 100755..100644
--- a/AudioManagerDaemon/docx/images/dependencies.png
+++ b/AudioManagerDaemon/docx/images/dependencies.png
Binary files differ
diff --git a/AudioManagerDaemon/docx/images/dependencies_test.png b/AudioManagerDaemon/docx/images/dependencies_test.png
index 05a30ad..870bc26 100644
--- a/AudioManagerDaemon/docx/images/dependencies_test.png
+++ b/AudioManagerDaemon/docx/images/dependencies_test.png
Binary files differ
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b2911d..be807be 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,6 +214,7 @@ ENDIF(WITH_TESTS)
IF(WITH_DOCUMENTATION)
find_package(Doxygen)
configure_file(${DOXY_FILE} ${DOC_OUTPUT_PATH}/Doxyfile @ONLY IMMEDIATE)
+ configure_file("README.html" ${DOC_OUTPUT_PATH}/html/README.html)
add_custom_target (AudioManangerDoku ALL
COMMAND ${DOXYGEN_EXECUTABLE} ${DOC_OUTPUT_PATH}/Doxyfile WORKING_DIRECTORY ${DOC_OUTPUT_PATH}
SOURCES ${CMAKE_SOURCE_DIR} ${DOC_OUTPUT_PATH}/Doxyfile
diff --git a/PluginCommandInterfaceCAPI/fidl/CommandInterface.fidl b/PluginCommandInterfaceCAPI/fidl/CommandInterface.fidl
index 0d752d6..1fc0d5f 100644
--- a/PluginCommandInterfaceCAPI/fidl/CommandInterface.fidl
+++ b/PluginCommandInterfaceCAPI/fidl/CommandInterface.fidl
@@ -101,7 +101,7 @@ interface CommandControl {
**>
method setMainSinkSoundProperty {
in {
- am_sinkID_t sinkID
+ am_sinkID_t sinkID
am_MainSoundProperty_s soundProperty
}
out {
@@ -115,7 +115,7 @@ interface CommandControl {
**>
method setMainSourceSoundProperty {
in {
- am_sourceID_t sourceID
+ am_sourceID_t sourceID
am_MainSoundProperty_s soundProperty
}
out {
@@ -146,12 +146,12 @@ interface CommandControl {
**>
method getListMainConnections {
out {
- am_Error_e ^error
<**
@description : returns a list of all connections
**>
am_MainConnection_L listConnections
+ am_Error_e ^error
}
}
@@ -602,4 +602,5 @@ interface CommandControl {
am_NotificationConfiguration_s mainNotificationConfiguration
}
}
+
} \ No newline at end of file
diff --git a/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf b/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf
index b3ae199..35c5558 100644
--- a/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf
+++ b/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf
@@ -4,5 +4,5 @@
##################################################################################################################
[local:org.genivi.audiomanger.commandinterface:org.genivi.audiomanger]
dbus_connection=org.genivi.audiomanager
-dbus_object=/org/genivi/audiomanager/commandinterface
-dbus_interface=org.genivi.audiomanager.commandinterface \ No newline at end of file
+dbus_object=/org/genivi/audiomanager/CommandControl
+dbus_interface=org.genivi.audiomanager.CommandControl \ No newline at end of file
diff --git a/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h b/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h
index 0fbf499..654436f 100644
--- a/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h
+++ b/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h
@@ -49,7 +49,7 @@ public:
virtual void setSystemProperty(org::genivi::am::am_SystemProperty_s soundProperty, org::genivi::am::am_Error_e& result);
- virtual void getListMainConnections(org::genivi::am::am_Error_e& result, org::genivi::am::am_MainConnection_L& listConnections);
+ virtual void getListMainConnections(org::genivi::am::am_MainConnection_L& listConnections,org::genivi::am::am_Error_e& result);
virtual void getListMainSinks(org::genivi::am::am_SinkType_L& listMainSinks, org::genivi::am::am_Error_e& result);
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp
index 01169e7..ab69bbb 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include "am.h"
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h
index 8e9b4be..4d94244 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_am_H_
#define ORG_GENIVI_am_H_
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h
index 88f5ca2..f631c92 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControl.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Command_Control_H_
#define ORG_GENIVI_AM_Command_Control_H_
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp
index 4901145..cf6f32b 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include "CommandControlDBusProxy.h"
@@ -281,18 +299,18 @@ std::future<CommonAPI::CallStatus> CommandControlDBusProxy::setSystemPropertyAsy
property,
std::move(callback));
}
-void CommandControlDBusProxy::getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections) {
+void CommandControlDBusProxy::getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error) {
CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<am_Error_e, am_MainConnection_L> >::callMethodWithReply(
+ CommonAPI::DBus::DBusSerializableArguments<am_MainConnection_L, am_Error_e> >::callMethodWithReply(
*this,
"getListMainConnections",
"",
callStatus
- , error, listConnections);
+ , listConnections, error);
}
std::future<CommonAPI::CallStatus> CommandControlDBusProxy::getListMainConnectionsAsync(GetListMainConnectionsAsyncCallback callback) {
return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<am_Error_e, am_MainConnection_L> >::callMethodAsync(
+ CommonAPI::DBus::DBusSerializableArguments<am_MainConnection_L, am_Error_e> >::callMethodAsync(
*this,
"getListMainConnections",
"",
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h
index 0c6e470..3f146b7 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusProxy.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Command_Control_DBUS_PROXY_H_
#define ORG_GENIVI_AM_Command_Control_DBUS_PROXY_H_
@@ -85,7 +103,7 @@ class CommandControlDBusProxy: virtual public CommandControlProxyBase, virtual p
virtual void setSystemProperty(const am_SystemProperty_s& property, CommonAPI::CallStatus& callStatus, am_Error_e& error);
virtual std::future<CommonAPI::CallStatus> setSystemPropertyAsync(const am_SystemProperty_s& property, SetSystemPropertyAsyncCallback callback);
- virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections);
+ virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error);
virtual std::future<CommonAPI::CallStatus> getListMainConnectionsAsync(GetListMainConnectionsAsyncCallback callback);
virtual void getListMainSinks(CommonAPI::CallStatus& callStatus, am_SinkType_L& listMainSinks, am_Error_e& error);
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp
index 89d06a8..4715cdb 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include "CommandControlDBusStubAdapter.h"
#include <org/genivi/am/CommandControl.h>
@@ -162,8 +180,8 @@ const char* CommandControlDBusStubAdapter::getMethodsDBusIntrospectionXmlData()
"<arg name=\"error\" type=\"i\" direction=\"out\" />\n"
"</method>\n"
"<method name=\"getListMainConnections\">\n"
- "<arg name=\"error\" type=\"i\" direction=\"out\" />\n"
"<arg name=\"listConnections\" type=\"a(qqqni)\" direction=\"out\" />\n"
+ "<arg name=\"error\" type=\"i\" direction=\"out\" />\n"
"</method>\n"
"<method name=\"getListMainSinks\">\n"
"<arg name=\"listMainSinks\" type=\"a(qs(iq)niq)\" direction=\"out\" />\n"
@@ -268,8 +286,8 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
CommandControlStub,
std::tuple<>,
- std::tuple<am_Error_e, am_MainConnection_L>
- > getListMainConnectionsStubDispatcher(&CommandControlStub::getListMainConnections, "ia(qqqni)");
+ std::tuple<am_MainConnection_L, am_Error_e>
+ > getListMainConnectionsStubDispatcher(&CommandControlStub::getListMainConnections, "a(qqqni)i");
static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
CommandControlStub,
std::tuple<>,
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h
index 0435d14..d51fdd7 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlDBusStubAdapter.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Command_Control_DBUS_STUB_ADAPTER_H_
#define ORG_GENIVI_AM_Command_Control_DBUS_STUB_ADAPTER_H_
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h
index 3f6b3fc..8bcb7fe 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxy.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Command_Control_PROXY_H_
#define ORG_GENIVI_AM_Command_Control_PROXY_H_
@@ -336,7 +354,7 @@ class CommandControlProxy: virtual public CommandControl, virtual public Command
* will be set.
* Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
*/
- virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections);
+ virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error);
/**
* Calls getListMainConnections with asynchronous semantics.
*
@@ -746,8 +764,8 @@ std::future<CommonAPI::CallStatus> CommandControlProxy<_AttributeExtensions...>:
}
template <typename ... _AttributeExtensions>
-void CommandControlProxy<_AttributeExtensions...>::getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections) {
- delegate_->getListMainConnections(callStatus, error, listConnections);
+void CommandControlProxy<_AttributeExtensions...>::getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error) {
+ delegate_->getListMainConnections(callStatus, listConnections, error);
}
template <typename ... _AttributeExtensions>
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h
index eaf1fc8..588e2a7 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlProxyBase.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+ * This file was generated by the CommonAPI Generators.
+ *
+ * This file was generated by the CommonAPI Generators.
+ *
+ * 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/.
*/
#ifndef ORG_GENIVI_AM_Command_Control_PROXY_BASE_H_
#define ORG_GENIVI_AM_Command_Control_PROXY_BASE_H_
@@ -66,7 +84,7 @@
typedef std::function<void(const CommonAPI::CallStatus&, const am_Error_e&)> SetMainSinkSoundPropertyAsyncCallback;
typedef std::function<void(const CommonAPI::CallStatus&, const am_Error_e&)> SetMainSourceSoundPropertyAsyncCallback;
typedef std::function<void(const CommonAPI::CallStatus&, const am_Error_e&)> SetSystemPropertyAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const am_Error_e&, const am_MainConnection_L&)> GetListMainConnectionsAsyncCallback;
+ typedef std::function<void(const CommonAPI::CallStatus&, const am_MainConnection_L&, const am_Error_e&)> GetListMainConnectionsAsyncCallback;
typedef std::function<void(const CommonAPI::CallStatus&, const am_SinkType_L&, const am_Error_e&)> GetListMainSinksAsyncCallback;
typedef std::function<void(const CommonAPI::CallStatus&, const am_SourceType_L&, const am_Error_e&)> GetListMainSourcesAsyncCallback;
typedef std::function<void(const CommonAPI::CallStatus&, const am_MainSoundProperty_L&, const am_Error_e&)> GetListMainSinkSoundPropertiesAsyncCallback;
@@ -130,7 +148,7 @@
virtual void setSystemProperty(const am_SystemProperty_s& property, CommonAPI::CallStatus& callStatus, am_Error_e& error) = 0;
virtual std::future<CommonAPI::CallStatus> setSystemPropertyAsync(const am_SystemProperty_s& property, SetSystemPropertyAsyncCallback callback) = 0;
- virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_Error_e& error, am_MainConnection_L& listConnections) = 0;
+ virtual void getListMainConnections(CommonAPI::CallStatus& callStatus, am_MainConnection_L& listConnections, am_Error_e& error) = 0;
virtual std::future<CommonAPI::CallStatus> getListMainConnectionsAsync(GetListMainConnectionsAsyncCallback callback) = 0;
virtual void getListMainSinks(CommonAPI::CallStatus& callStatus, am_SinkType_L& listMainSinks, am_Error_e& error) = 0;
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h
index 5bca231..838a7e6 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStub.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Command_Control_STUB_H_
#define ORG_GENIVI_AM_Command_Control_STUB_H_
@@ -205,7 +223,7 @@ class CommandControlStub : public CommonAPI::Stub<CommandControlStubAdapter , Co
/// This is the method that will be called on remote calls on the method setSystemProperty.
virtual void setSystemProperty(am_SystemProperty_s property, am_Error_e& error) = 0;
/// This is the method that will be called on remote calls on the method getListMainConnections.
- virtual void getListMainConnections(am_Error_e& error, am_MainConnection_L& listConnections) = 0;
+ virtual void getListMainConnections(am_MainConnection_L& listConnections, am_Error_e& error) = 0;
/// This is the method that will be called on remote calls on the method getListMainSinks.
virtual void getListMainSinks(am_SinkType_L& listMainSinks, am_Error_e& error) = 0;
/// This is the method that will be called on remote calls on the method getListMainSources.
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp
index a1185ec..9e8e39b 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include <org/genivi/am/CommandControlStubDefault.h>
@@ -53,7 +71,7 @@ void CommandControlStubDefault::setSystemProperty(am_SystemProperty_s property,
// No operation in default
}
-void CommandControlStubDefault::getListMainConnections(am_Error_e& error, am_MainConnection_L& listConnections) {
+void CommandControlStubDefault::getListMainConnections(am_MainConnection_L& listConnections, am_Error_e& error) {
// No operation in default
}
diff --git a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
index e718d76..5b30746 100644
--- a/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
+++ b/PluginCommandInterfaceCAPI/src-gen/org/genivi/am/CommandControlStubDefault.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Command_Control_STUB_DEFAULT_H_
#define ORG_GENIVI_AM_Command_Control_STUB_DEFAULT_H_
@@ -47,7 +65,7 @@ class CommandControlStubDefault : public CommandControlStub {
virtual void setSystemProperty(am_SystemProperty_s property, am_Error_e& error);
- virtual void getListMainConnections(am_Error_e& error, am_MainConnection_L& listConnections);
+ virtual void getListMainConnections(am_MainConnection_L& listConnections, am_Error_e& error);
virtual void getListMainSinks(am_SinkType_L& listMainSinks, am_Error_e& error);
diff --git a/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp b/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp
index e9f7f9a..552ff9a 100644
--- a/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp
+++ b/PluginCommandInterfaceCAPI/src/CAmCommandSenderService.cpp
@@ -81,7 +81,7 @@ void CAmCommandSenderService::setSystemProperty(org::genivi::am::am_SystemProper
result = CAmConvert2CAPIType(mpIAmCommandReceive->setSystemProperty(property));
}
-void CAmCommandSenderService::getListMainConnections(org::genivi::am::am_Error_e& result, org::genivi::am::am_MainConnection_L& listConnections) {
+void CAmCommandSenderService::getListMainConnections(org::genivi::am::am_MainConnection_L& listConnections,org::genivi::am::am_Error_e& result) {
assert(mpIAmCommandReceive);
std::vector<am_MainConnectionType_s> list;
result = CAmConvert2CAPIType(mpIAmCommandReceive->getListMainConnections(list));
diff --git a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp
index 8285b6e..7cbc0c8 100644
--- a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp
+++ b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.cpp
@@ -372,7 +372,7 @@ TEST_F(CAmCommandSenderCAPITest, GetListMainConnectionsTest)
EXPECT_CALL(*env->mpCommandReceive, getListMainConnections(_)).WillOnce(DoAll(returnListConnections(), Return(E_OK)));
org::genivi::am::am_MainConnection_L listConnections;
- env->mProxy->getListMainConnections(callStatus, result, listConnections);
+ env->mProxy->getListMainConnections(callStatus, listConnections, result);
ASSERT_EQ(result, org::genivi::am::am_Error_e::E_OK);
ASSERT_EQ(1, listConnections.size());
ASSERT_EQ(15, listConnections.at(0).mainConnectionID);
diff --git a/PluginRoutingInterfaceCAPI/fidl/PluginRoutingInterfaceCAPI_dbus.conf b/PluginRoutingInterfaceCAPI/fidl/PluginRoutingInterfaceCAPI_dbus.conf
index 799a9a3..583d99d 100755
--- a/PluginRoutingInterfaceCAPI/fidl/PluginRoutingInterfaceCAPI_dbus.conf
+++ b/PluginRoutingInterfaceCAPI/fidl/PluginRoutingInterfaceCAPI_dbus.conf
@@ -4,5 +4,5 @@
##################################################################################################################
[local:org.genivi.audiomanger.routinginterface:org.genivi.audiomanger]
dbus_connection=org.genivi.audiomanager
-dbus_object=/org/genivi/audiomanager/routinginterface
-dbus_interface=org.genivi.audiomanager.routinginterface \ No newline at end of file
+dbus_object=/org/genivi/audiomanager/RoutingObserver
+dbus_interface=org.genivi.audiomanager.RoutingObserver \ No newline at end of file
diff --git a/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl b/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl
index 877b75c..0a6e700 100644
--- a/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl
+++ b/PluginRoutingInterfaceCAPI/fidl/RoutingInterface.fidl
@@ -201,7 +201,7 @@ interface RoutingControlObserver {
@description : This attribute signals to the clients the current routing state.
A client should notify himself to this attribute in order to know the current state and act accordingly.
**>
- attribute am_RoutingReady_e RoutingReady
+ attribute am_RoutingReady_e RoutingReady //readonly
<**
@description : acknowledges a asyncConnect
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp
index 01169e7..ab69bbb 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include "am.h"
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h
index 8e9b4be..4d94244 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_am_H_
#define ORG_GENIVI_am_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h
index 40ef21c..04818d5 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControl.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_H_
#define ORG_GENIVI_AM_Routing_Control_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp
index e55f256..dfb0e8c 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include "RoutingControlDBusProxy.h"
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h
index 9e73446..96e8f2d 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusProxy.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_DBUS_PROXY_H_
#define ORG_GENIVI_AM_Routing_Control_DBUS_PROXY_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp
index fe14623..9b66f5a 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include "RoutingControlDBusStubAdapter.h"
#include <org/genivi/am/RoutingControl.h>
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h
index c25c98a..0cd33f3 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlDBusStubAdapter.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_DBUS_STUB_ADAPTER_H_
#define ORG_GENIVI_AM_Routing_Control_DBUS_STUB_ADAPTER_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h
index e5b6803..85a2ac0 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserver.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_Observer_H_
#define ORG_GENIVI_AM_Routing_Control_Observer_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp
index 370b831..38cf3c3 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include "RoutingControlObserverDBusProxy.h"
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h
index 0c057e2..42e0828 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_Observer_DBUS_PROXY_H_
#define ORG_GENIVI_AM_Routing_Control_Observer_DBUS_PROXY_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp
index 11e838b..5f55964 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include "RoutingControlObserverDBusStubAdapter.h"
#include <org/genivi/am/RoutingControlObserver.h>
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h
index 79d460f..e8eefd1 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_Observer_DBUS_STUB_ADAPTER_H_
#define ORG_GENIVI_AM_Routing_Control_Observer_DBUS_STUB_ADAPTER_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h
index 8ad2394..421912f 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_Observer_PROXY_H_
#define ORG_GENIVI_AM_Routing_Control_Observer_PROXY_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h
index de76001..7325057 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+ * This file was generated by the CommonAPI Generators.
+ *
+ * This file was generated by the CommonAPI Generators.
+ *
+ * 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_Observer_PROXY_BASE_H_
#define ORG_GENIVI_AM_Routing_Control_Observer_PROXY_BASE_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h
index 803fa59..bc767cf 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_Observer_STUB_H_
#define ORG_GENIVI_AM_Routing_Control_Observer_STUB_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp
index 2483387..99515c0 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include <org/genivi/am/RoutingControlObserverStubDefault.h>
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h
index 5ff81d0..2196e1d 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_Observer_STUB_DEFAULT_H_
#define ORG_GENIVI_AM_Routing_Control_Observer_STUB_DEFAULT_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h
index 817567f..0bace13 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxy.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_PROXY_H_
#define ORG_GENIVI_AM_Routing_Control_PROXY_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h
index 8f2bc8e..7c7c9fe 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlProxyBase.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+ * This file was generated by the CommonAPI Generators.
+ *
+ * This file was generated by the CommonAPI Generators.
+ *
+ * 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_PROXY_BASE_H_
#define ORG_GENIVI_AM_Routing_Control_PROXY_BASE_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h
index cdaebc4..25f74b8 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStub.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_STUB_H_
#define ORG_GENIVI_AM_Routing_Control_STUB_H_
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp
index 69a0e6e..0a5e4a2 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.cpp
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#include <org/genivi/am/RoutingControlStubDefault.h>
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h
index 922c975..f8ca0a9 100644
--- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h
+++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlStubDefault.h
@@ -1,9 +1,27 @@
/*
* This file was generated by the CommonAPI Generators.
*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
+* This file was generated by the CommonAPI Generators.
+*
+* This file was generated by the CommonAPI Generators.
+*
+* 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/.
*/
#ifndef ORG_GENIVI_AM_Routing_Control_STUB_DEFAULT_H_
#define ORG_GENIVI_AM_Routing_Control_STUB_DEFAULT_H_
diff --git a/README b/README
index d20ab37..3519f23 100755
--- a/README
+++ b/README
@@ -60,28 +60,33 @@ These are the compile options with default values:
BUILD_SHARED_LIBS OFF
CMAKE_BUILD_TYPE
CMAKE_INSTALL_PREFIX /usr/local
+ COMMON_API_DBUS_LIBRARY /usr/local/lib/libCommonAPI-DBus.so
+ COMMON_API_LIBRARY /usr/local/lib/libCommonAPI.so
GLIB_DBUS_TYPES_TOLERANT ON
USE_BUILD_LIBS ON
- WITH_COMMAND_INTERFACE_DBUS ON
- WITH_DATABASE_STORAGE ON
- WITH_DBUS_WRAPPER ON
- WITH_DLT OFF
- WITH_DOCUMENTATION ON
- WITH_NSM OFF
+ WITH_COMMAND_INTERFACE_COMMON_ ON
+ WITH_DATABASE_STORAGE OFF
+ WITH_DLT ON
+ WITH_DOCUMENTATION ON
+ WITH_ENABLED_IPC CAPI
+ WITH_LOGSTATE ON
+ WITH_NSM ON
+ WITH_OXF_ANIMATION OFF
+ WITH_OXF_TRACE OFF
WITH_PLUGIN_COMMAND ON
WITH_PLUGIN_CONTROL ON
WITH_PLUGIN_ROUTING ON
WITH_ROUTING_INTERFACE_ASYNC OFF
- WITH_ROUTING_INTERFACE_DBUS ON
+ WITH_ROUTING_INTERFACE_CAPI ON
WITH_SYSTEMD_WATCHDOG OFF
- WITH_TELNET OFF
- WITH_TESTS OFF
+ WITH_TELNET ON
+ WITH_TESTS ON
WITH_TEST_CONTROLLER OFF
gmock_build_tests OFF
gtest_build_samples OFF
gtest_build_tests OFF
gtest_disable_pthreads OFF
- gtest_force_shared_crt OFF
+ gtest_force_shared_crt OFF
=== Passing options to cmake:
@@ -118,7 +123,8 @@ You will need optionally fullfill some dependencies in order to comile the GENIV
* dbus (only when DBUS_WRAPPER==ON) [tested on version 1.2.16]
* sqlite3 [tested on version 3.6.22] (only when WITH_DATABASE_STORAGE==ON)
* automotive-dlt [greater 2.5.0] (only when WITH_DLT==ON)
-* doxygen (only when WITH_DOCUMENTATION==ON) [tested on version 1.6.3]
+* doxygen [tested on version 1.6.3] (only when WITH_DOCUMENTATION==ON)
+* commonAPI [version > 2.1] (only with WITH_ENABLED_IPC CAPI), more information here http://projects.genivi.org/commonapi/
To install them in a build environment like Ubuntu you can use:
----
diff --git a/README.html b/README.html
index 97e8328..6fa0e72 100644
--- a/README.html
+++ b/README.html
@@ -805,22 +805,27 @@ make</tt></pre>
<pre><tt>BUILD_SHARED_LIBS OFF
CMAKE_BUILD_TYPE
CMAKE_INSTALL_PREFIX /usr/local
+COMMON_API_DBUS_LIBRARY /usr/local/lib/libCommonAPI-DBus.so
+COMMON_API_LIBRARY /usr/local/lib/libCommonAPI.so
GLIB_DBUS_TYPES_TOLERANT ON
USE_BUILD_LIBS ON
-WITH_COMMAND_INTERFACE_DBUS ON
-WITH_DATABASE_STORAGE ON
-WITH_DBUS_WRAPPER ON
-WITH_DLT OFF
+WITH_COMMAND_INTERFACE_COMMON_ ON
+WITH_DATABASE_STORAGE OFF
+WITH_DLT ON
WITH_DOCUMENTATION ON
-WITH_NSM OFF
+WITH_ENABLED_IPC CAPI
+WITH_LOGSTATE ON
+WITH_NSM ON
+WITH_OXF_ANIMATION OFF
+WITH_OXF_TRACE OFF
WITH_PLUGIN_COMMAND ON
WITH_PLUGIN_CONTROL ON
WITH_PLUGIN_ROUTING ON
WITH_ROUTING_INTERFACE_ASYNC OFF
-WITH_ROUTING_INTERFACE_DBUS ON
+WITH_ROUTING_INTERFACE_CAPI ON
WITH_SYSTEMD_WATCHDOG OFF
-WITH_TELNET OFF
-WITH_TESTS OFF
+WITH_TELNET ON
+WITH_TESTS ON
WITH_TEST_CONTROLLER OFF
gmock_build_tests OFF
gtest_build_samples OFF
@@ -864,7 +869,12 @@ automotive-dlt [greater 2.5.0] (only when WITH_DLT==ON)
</li>
<li>
<p>
-doxygen (only when WITH_DOCUMENTATION==ON) [tested on version 1.6.3]
+doxygen [tested on version 1.6.3] (only when WITH_DOCUMENTATION==ON)
+</p>
+</li>
+<li>
+<p>
+commonAPI [version &gt; 2.1] (only with WITH_ENABLED_IPC CAPI), more information here <a href="http://projects.genivi.org/commonapi/">http://projects.genivi.org/commonapi/</a>
</p>
</li>
</ul></div>
@@ -1210,7 +1220,7 @@ handle later on.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-06-26 17:30:25 CEST
+Last updated 2013-09-12 10:26:35 CEST
</div>
</div>
</body>
diff --git a/exampleCode/player/Makefile b/exampleCode/player/Makefile
deleted file mode 100644
index 75cbae6..0000000
--- a/exampleCode/player/Makefile
+++ /dev/null
@@ -1,336 +0,0 @@
-#############################################################################
-# Makefile for building: qmediaplayer
-# Generated by qmake (2.01a) (Qt 4.8.1) on: Mon Jun 4 13:20:55 2012
-# Project: qmediaplayer.pro
-# Template: app
-# Command: /opt/QtSDK/Desktop/Qt/4.8.1/gcc/bin/qmake -spec /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/linux-g++-32 CONFIG+=debug CONFIG+=declarative_debug -o Makefile qmediaplayer.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC = gcc
-CXX = g++
-DEFINES = -DQT_PHONON_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -m32 -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS = -m32 -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH = -I/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/linux-g++-32 -I. -I/opt/QtSDK/Desktop/Qt/4.8.1/gcc/include/QtCore -I/opt/QtSDK/Desktop/Qt/4.8.1/gcc/include/QtGui -I/opt/QtSDK/Desktop/Qt/4.8.1/gcc/include/phonon -I/opt/QtSDK/Desktop/Qt/4.8.1/gcc/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/opt/QtSDK/Desktop/Qt/4.8.1/gcc/include/phonon_compat -I. -I.
-LINK = g++
-LFLAGS = -m32 -Wl,-rpath,/opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib
-LIBS = $(SUBLIBS) -L/opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib -ldbus-glib-1 -ldbus-1 -lrt -lgobject-2.0 -lphonon -L/opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib -lpulse-mainloop-glib -lpulse -lglib-2.0 -lQtDBus -lQtXml -L/usr/X11R6/lib64 -lQtGui -lQtCore -lpthread
-AR = ar cqs
-RANLIB =
-QMAKE = /opt/QtSDK/Desktop/Qt/4.8.1/gcc/bin/qmake
-TAR = tar -cf
-COMPRESS = gzip -9f
-COPY = cp -f
-SED = sed
-COPY_FILE = $(COPY)
-COPY_DIR = $(COPY) -r
-STRIP = strip
-INSTALL_FILE = install -m 644 -p
-INSTALL_DIR = $(COPY_DIR)
-INSTALL_PROGRAM = install -m 755 -p
-DEL_FILE = rm -f
-SYMLINK = ln -f -s
-DEL_DIR = rmdir
-MOVE = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR = ./
-
-####### Files
-
-SOURCES = main.cpp \
- mediaplayer.cpp \
- audiomanagerinteractor.cpp \
- dbushandler.cpp moc_mediaplayer.cpp \
- moc_audiomanagerinteractor.cpp \
- moc_dbushandler.cpp \
- qrc_mediaplayer.cpp
-OBJECTS = main.o \
- mediaplayer.o \
- audiomanagerinteractor.o \
- dbushandler.o \
- moc_mediaplayer.o \
- moc_audiomanagerinteractor.o \
- moc_dbushandler.o \
- qrc_mediaplayer.o
-DIST = /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/unix.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/linux.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/gcc-base.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/gcc-base-unix.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/g++-base.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/g++-unix.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/qconfig.pri \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/modules/qt_webkit_version.pri \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/qt_functions.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/qt_config.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/exclusive_builds.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/default_pre.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/debug.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/default_post.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/link_pkgconfig.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/declarative_debug.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/unix/gdb_dwarf_index.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/warn_on.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/qt.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/unix/thread.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/moc.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/resources.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/uic.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/yacc.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/lex.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/include_source_dir.prf \
- qmediaplayer.pro
-QMAKE_TARGET = qmediaplayer
-DESTDIR =
-TARGET = qmediaplayer
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .o .c .cpp .cc .cxx .C
-
-.cpp.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cc.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cxx.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.C.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.c.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
-
-####### Build rules
-
-all: Makefile $(TARGET)
-
-$(TARGET): ui_settings.h $(OBJECTS)
- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
- { test -n "$(DESTDIR)" && DESTDIR="$(DESTDIR)" || DESTDIR=.; } && test $$(gdb --version | sed -e 's,[^0-9]\+\([0-9]\)\.\([0-9]\).*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index $$DESTDIR" -ex quit '$(TARGET)' && test -f $(TARGET).gdb-index && objcopy --add-section '.gdb_index=$(TARGET).gdb-index' --set-section-flags '.gdb_index=readonly' '$(TARGET)' '$(TARGET)' && rm -f $(TARGET).gdb-index || true
-
-Makefile: qmediaplayer.pro /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/linux-g++-32/qmake.conf /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/unix.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/linux.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/gcc-base.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/gcc-base-unix.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/g++-base.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/g++-unix.conf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/qconfig.pri \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/modules/qt_webkit_version.pri \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/qt_functions.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/qt_config.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/exclusive_builds.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/default_pre.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/debug.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/default_post.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/link_pkgconfig.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/declarative_debug.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/unix/gdb_dwarf_index.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/warn_on.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/qt.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/unix/thread.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/moc.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/resources.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/uic.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/yacc.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/lex.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/include_source_dir.prf \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libphonon.prl \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libQtDBus.prl \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libQtXml.prl \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libQtCore.prl \
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libQtGui.prl
- $(QMAKE) -spec /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/linux-g++-32 CONFIG+=debug CONFIG+=declarative_debug -o Makefile qmediaplayer.pro
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/unix.conf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/linux.conf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/gcc-base.conf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/gcc-base-unix.conf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/g++-base.conf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/common/g++-unix.conf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/qconfig.pri:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/modules/qt_webkit_version.pri:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/qt_functions.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/qt_config.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/exclusive_builds.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/default_pre.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/debug.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/default_post.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/link_pkgconfig.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/declarative_debug.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/unix/gdb_dwarf_index.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/warn_on.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/qt.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/unix/thread.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/moc.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/resources.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/uic.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/yacc.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/lex.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/features/include_source_dir.prf:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libphonon.prl:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libQtDBus.prl:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libQtXml.prl:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libQtCore.prl:
-/opt/QtSDK/Desktop/Qt/4.8.1/gcc/lib/libQtGui.prl:
-qmake: FORCE
- @$(QMAKE) -spec /opt/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/linux-g++-32 CONFIG+=debug CONFIG+=declarative_debug -o Makefile qmediaplayer.pro
-
-dist:
- @$(CHK_DIR_EXISTS) .tmp/qmediaplayer1.0.0 || $(MKDIR) .tmp/qmediaplayer1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/qmediaplayer1.0.0/ && $(COPY_FILE) --parents mediaplayer.h audiomanagerinteractor.h dbushandler.h audiomanagertypes.h .tmp/qmediaplayer1.0.0/ && $(COPY_FILE) --parents mediaplayer.qrc .tmp/qmediaplayer1.0.0/ && $(COPY_FILE) --parents main.cpp mediaplayer.cpp audiomanagerinteractor.cpp dbushandler.cpp .tmp/qmediaplayer1.0.0/ && $(COPY_FILE) --parents settings.ui .tmp/qmediaplayer1.0.0/ && (cd `dirname .tmp/qmediaplayer1.0.0` && $(TAR) qmediaplayer1.0.0.tar qmediaplayer1.0.0 && $(COMPRESS) qmediaplayer1.0.0.tar) && $(MOVE) `dirname .tmp/qmediaplayer1.0.0`/qmediaplayer1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/qmediaplayer1.0.0
-
-
-clean:compiler_clean
- -$(DEL_FILE) $(OBJECTS)
- -$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
- -$(DEL_FILE) $(TARGET)
- -$(DEL_FILE) Makefile
-
-
-check: first
-
-mocclean: compiler_moc_header_clean compiler_moc_source_clean
-
-mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-
-compiler_moc_header_make_all: moc_mediaplayer.cpp moc_audiomanagerinteractor.cpp moc_dbushandler.cpp
-compiler_moc_header_clean:
- -$(DEL_FILE) moc_mediaplayer.cpp moc_audiomanagerinteractor.cpp moc_dbushandler.cpp
-moc_mediaplayer.cpp: mediaplayer.h
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/bin/moc $(DEFINES) $(INCPATH) mediaplayer.h -o moc_mediaplayer.cpp
-
-moc_audiomanagerinteractor.cpp: dbushandler.h \
- audiomanagertypes.h \
- projecttypes.h \
- audiomanagerinteractor.h
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/bin/moc $(DEFINES) $(INCPATH) audiomanagerinteractor.h -o moc_audiomanagerinteractor.cpp
-
-moc_dbushandler.cpp: audiomanagertypes.h \
- projecttypes.h \
- dbushandler.h
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/bin/moc $(DEFINES) $(INCPATH) dbushandler.h -o moc_dbushandler.cpp
-
-compiler_rcc_make_all: qrc_mediaplayer.cpp
-compiler_rcc_clean:
- -$(DEL_FILE) qrc_mediaplayer.cpp
-qrc_mediaplayer.cpp: mediaplayer.qrc \
- images/screen.png
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/bin/rcc -name mediaplayer mediaplayer.qrc -o qrc_mediaplayer.cpp
-
-compiler_image_collection_make_all: qmake_image_collection.cpp
-compiler_image_collection_clean:
- -$(DEL_FILE) qmake_image_collection.cpp
-compiler_moc_source_make_all:
-compiler_moc_source_clean:
-compiler_uic_make_all: ui_settings.h
-compiler_uic_clean:
- -$(DEL_FILE) ui_settings.h
-ui_settings.h: settings.ui
- /opt/QtSDK/Desktop/Qt/4.8.1/gcc/bin/uic settings.ui -o ui_settings.h
-
-compiler_yacc_decl_make_all:
-compiler_yacc_decl_clean:
-compiler_yacc_impl_make_all:
-compiler_yacc_impl_clean:
-compiler_lex_make_all:
-compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_uic_clean
-
-####### Compile
-
-main.o: main.cpp mediaplayer.h \
- dbushandler.h \
- audiomanagertypes.h \
- projecttypes.h \
- audiomanagerinteractor.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
-
-mediaplayer.o: mediaplayer.cpp mediaplayer.h \
- ui_settings.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mediaplayer.o mediaplayer.cpp
-
-audiomanagerinteractor.o: audiomanagerinteractor.cpp audiomanagerinteractor.h \
- dbushandler.h \
- audiomanagertypes.h \
- projecttypes.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o audiomanagerinteractor.o audiomanagerinteractor.cpp
-
-dbushandler.o: dbushandler.cpp dbushandler.h \
- audiomanagertypes.h \
- projecttypes.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o dbushandler.o dbushandler.cpp
-
-moc_mediaplayer.o: moc_mediaplayer.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mediaplayer.o moc_mediaplayer.cpp
-
-moc_audiomanagerinteractor.o: moc_audiomanagerinteractor.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_audiomanagerinteractor.o moc_audiomanagerinteractor.cpp
-
-moc_dbushandler.o: moc_dbushandler.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dbushandler.o moc_dbushandler.cpp
-
-qrc_mediaplayer.o: qrc_mediaplayer.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_mediaplayer.o qrc_mediaplayer.cpp
-
-####### Install
-
-install_target: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/ || $(MKDIR) $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/$(QMAKE_TARGET)"
-
-uninstall_target: FORCE
- -$(DEL_FILE) "$(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/$(QMAKE_TARGET)"
- -$(DEL_DIR) $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
-
-
-install_sources: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/ || $(MKDIR) $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/main.cpp $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/mediaplayer.cpp $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/audiomanagerinteractor.cpp $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/dbushandler.cpp $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/mediaplayer.h $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/audiomanagerinteractor.h $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/dbushandler.h $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_PROGRAM) /home/christian/workspace/qmediaplayer/audiomanagertypes.h $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/settings.ui $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/mediaplayer.qrc $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_FILE) /home/christian/workspace/qmediaplayer/qmediaplayer.pro $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
- -$(INSTALL_DIR) /home/christian/workspace/qmediaplayer/images $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
-
-
-uninstall_sources: FORCE
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/main.cpp
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/mediaplayer.cpp
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/audiomanagerinteractor.cpp
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/dbushandler.cpp
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/mediaplayer.h
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/audiomanagerinteractor.h
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/dbushandler.h
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/audiomanagertypes.h
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/settings.ui
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/mediaplayer.qrc
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/qmediaplayer.pro
- -$(DEL_FILE) -r $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/images
- -$(DEL_DIR) $(INSTALL_ROOT)/opt/QtSDK/Demos/4.7/qmediaplayer/
-
-
-install: install_target install_sources FORCE
-
-uninstall: uninstall_target uninstall_sources FORCE
-
-FORCE:
-
diff --git a/exampleCode/player/README b/exampleCode/player/README
deleted file mode 100644
index aa8fca3..0000000
--- a/exampleCode/player/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This code is a sample player for the AudioManager and was used for the POC in 2012.
-
-It is based on a QT sample player.
-
-In order to compile it, open it with a QT Creator.
diff --git a/exampleCode/player/audiomanagerinteractor.cpp b/exampleCode/player/audiomanagerinteractor.cpp
deleted file mode 100644
index 528006b..0000000
--- a/exampleCode/player/audiomanagerinteractor.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (C) 2012, BMW AG
- *
- *
- * \copyright
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, version 2
- * of the License.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *
- * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
- *
- *
- */
-
-#include "audiomanagerinteractor.h"
-#include <iostream>
-
-using namespace am;
-
-AudioManagerInteractor::AudioManagerInteractor(DbusHandler* DbusHandler, am_sourceID_t sourceID, am_sinkID_t sinkID) :
- mDbusHandler(DbusHandler),
- mSourceID(sourceID),
- mSinkID(sinkID),
- mConnectionID(0),
- mState(Phonon::StoppedState),
- mConnectedState(DISCONNECTED)
-{
-}
-
-void AudioManagerInteractor::playPause()
-{
- if (mState==Phonon::StoppedState || mState==Phonon::PausedState)
- {
- mDbusHandler->connect(mSourceID,mSinkID,mConnectionID);
- mConnectedState=CONNECTING;
- }
- else
- {
- mDbusHandler->disconnect(mConnectionID);
- mConnectedState=DISCONNECTED;
- }
-}
-
-void AudioManagerInteractor::SourceActivity(am_sourceID_t source,am_SourceState_e state)
-{
- std::cout<<"got source activity ID "<<source<<" "<<state<<std::endl;
- if (source==mSourceID && state==SS_ON)
- emit this->play();
- else if (source==mSourceID && (state==SS_OFF || state==SS_PAUSED))
- emit this->stop();
-}
-
-void AudioManagerInteractor::getPlayerState(Phonon::State newstate)
-{
- mState=newstate;
- if (newstate==Phonon::StoppedState && mConnectedState==CONNECTED)
- mDbusHandler->disconnect(mConnectionID);
- else if (mConnectedState==CONNECTING)
- mConnectedState=CONNECTED;
-}
-
-
-AudioManagerInteractor::~AudioManagerInteractor()
-{
-
-}
diff --git a/exampleCode/player/audiomanagerinteractor.h b/exampleCode/player/audiomanagerinteractor.h
deleted file mode 100644
index 77b01eb..0000000
--- a/exampleCode/player/audiomanagerinteractor.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (C) 2012, BMW AG
- *
- *
- * \copyright
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, version 2
- * of the License.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *
- * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
- *
- *
- */
-
-
-#ifndef AUDIOMANAGERINTERACTOR_H
-#define AUDIOMANAGERINTERACTOR_H
-
-#include <dbus/dbus.h>
-#include <glib.h>
-#include <stdint.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <QtGui/QWidget>
-#include <QtGui/QApplication>
-#include <QtCore/QTimerEvent>
-#include <QtGui/QShowEvent>
-#include <QtGui/QIcon>
-#include <QtCore/QBasicTimer>
-#include <QtGui/QAction>
-#include <QObject>
-#include <phonon/phononnamespace.h>
-#include "dbushandler.h"
-
-class AudioManagerInteractor : public QObject
-{
- Q_OBJECT
-public:
- AudioManagerInteractor(DbusHandler* DbusHandler, am_sourceID_t sourceID, am_sinkID_t sinkID);
- ~AudioManagerInteractor();
-
-signals:
- void play();
- void stop();
-
-public slots:
- void playPause();
- void SourceActivity(am_sourceID_t source,am_SourceState_e state);
- void getPlayerState(Phonon::State newstate);
-private:
- DbusHandler* mDbusHandler;
- am_sourceID_t mSourceID;
- am_sinkID_t mSinkID;
- am_connectionID_t mConnectionID;
- Phonon::State mState;
- enum connected_e
- {
- CONNECTED,
- CONNECTING,
- DISCONNECTED
- };
- connected_e mConnectedState;
-};
-
-#endif // AUDIOMANAGERINTERACTOR_H
diff --git a/exampleCode/player/audiomanagertypes.h b/exampleCode/player/audiomanagertypes.h
deleted file mode 100755
index 8ac58b7..0000000
--- a/exampleCode/player/audiomanagertypes.h
+++ /dev/null
@@ -1,1243 +0,0 @@
-/**
- * Copyright (C) 2012, BMW AG
- *
- *
- * \copyright
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, version 2
- * of the License.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *
- * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
- *
- *
- */
-#if !defined(EA_F9B4F59D_FED5_44ac_85F2_F9F60549C133__INCLUDED_)
-#define EA_F9B4F59D_FED5_44ac_85F2_F9F60549C133__INCLUDED_
-
-#include <stdint.h>
-#include "projecttypes.h"
-#include <string>
-#include <vector>
-
-#define AM_MUTE -3000
-
-namespace am {
- /**
- * a domain ID
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_domainID_t;
-
- /**
- * a source ID
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_sourceID_t;
-
- /**
- * a sink ID
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_sinkID_t;
-
- /**
- * a gateway ID
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_gatewayID_t;
-
- /**
- * a crossfader ID
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_crossfaderID_t;
-
- /**
- * a connection ID
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_connectionID_t;
-
- /**
- * a mainConnection ID
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_mainConnectionID_t;
-
- /**
- * speed
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_speed_t;
-
- /**
- * The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and
- * maximum can be limited by actual project.
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef int16_t am_volume_t;
-
- /**
- * This is the volume presented on the command interface. It is in the duty of the
- * Controller to change the volumes given here into meaningful values on the
- * routing interface.
- * The range of this type is customer specific.
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef int16_t am_mainVolume_t;
-
- /**
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_sourceClass_t;
-
- /**
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_sinkClass_t;
-
- /**
- * time in ms!
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef uint16_t am_time_t;
-
- /**
- * offset time that is introduced in milli seconds.
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:13 PM
- */
- typedef int16_t am_timeSync_t;
-
- /**
- * with the help of this enum, sinks and sources can report their availability
- * state
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_Availability_e
- {
- /**
- * default
- */
- A_UNKNOWN = 0,
- /**
- * The source / sink is available
- */
- A_AVAILABLE = 1,
- /**
- * the source / sink is not available
- */
- A_UNAVAILABLE = 2,
- A_MAX
- };
-
- /**
- * represents the connection state
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_ConnectionState_e
- {
- CS_UNKNOWN = 0,
- /**
- * This means the connection is just building up
- */
- CS_CONNECTING = 1,
- /**
- * the connection is ready to be used
- */
- CS_CONNECTED = 2,
- /**
- * the connection is in the course to be knocked down
- */
- CS_DISCONNECTING = 3,
- /**
- * only relevant for connectionStatechanged. Is send after the connection was
- * removed
- */
- CS_DISCONNECTED = 4,
- /**
- * this means the connection is still build up but unused at the moment
- */
- CS_SUSPENDED = 5,
- CS_MAX
- };
-
- /**
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_DomainState_e
- {
- /**
- * default
- */
- DS_UNKNOWN = 0,
- /**
- * the domain is controlled by the daemon
- */
- DS_CONTROLLED = 1,
- /**
- * the domain is independent starting up
- */
- DS_INDEPENDENT_STARTUP = 1,
- /**
- * the domain is independent running down
- */
- DS_INDEPENDENT_RUNDOWN = 2,
- DS_MAX
- };
-
- /**
- * This enum characterizes the data of the EarlyData_t
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_EarlyDataType_e
- {
- /**
- * default
- */
- ES_UNKNOWN = 0,
- /**
- * the source volume
- */
- ED_SOURCE_VOLUME = 1,
- /**
- * the sink volume
- */
- ED_SINK_VOLUME = 2,
- /**
- * a source property
- */
- ED_SOURCE_PROPERTY = 3,
- /**
- * a sink property
- */
- ED_SINK_PROPERTY = 4,
- ED_MAX
- };
-
- /**
- * the errors of the audiomanager. All possible errors are in here. This enum is
- * used widely as return parameter.
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_Error_e
- {
- /**
- * no error - positive reply
- */
- E_OK = 0,
- /**
- * default
- */
- E_UNKNOWN = 1,
- /**
- * value out of range
- */
- E_OUT_OF_RANGE = 2,
- /**
- * not used
- */
- E_NOT_USED = 3,
- /**
- * a database error occurred
- */
- E_DATABASE_ERROR = 4,
- /**
- * the desired object already exists
- */
- E_ALREADY_EXISTS = 5,
- /**
- * there is no change
- */
- E_NO_CHANGE = 6,
- /**
- * the desired action is not possible
- */
- E_NOT_POSSIBLE = 7,
- /**
- * the desired object is non existent
- */
- E_NON_EXISTENT = 8,
- /**
- * the asynchronous action was aborted
- */
- E_ABORTED = 9,
- /**
- * This error is returned in case a connect is issued with a connectionFormat that
- * cannot be selected for the connection. This could be either due to the
- * capabilities of a source or a sink or gateway compatibilities for example
- */
- E_WRONG_FORMAT = 10,
- E_MAX
- };
-
- /**
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_MuteState_e
- {
- /**
- * default
- */
- MS_UNKNOWN = 0,
- /**
- * the source / sink is muted
- */
- MS_MUTED = 1,
- /**
- * the source / sink is unmuted
- */
- MS_UNMUTED = 2,
- MS_MAX
- };
-
- /**
- * The source state reflects the state of the source
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_SourceState_e
- {
- SS_UNKNNOWN = 0,
- /**
- * The source can be activly heared
- */
- SS_ON = 1,
- /**
- * The source cannot be heared
- */
- SS_OFF = 2,
- /**
- * The source is paused. Meaning it cannot be heared but should be prepared to
- * play again soon.
- */
- SS_PAUSED = 3,
- SS_MAX
- };
-
- /**
- * This enumeration is used to define the type of the action that is correlated to
- * a handle.
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_Handle_e
- {
- H_UNKNOWN = 0,
- H_CONNECT = 1,
- H_DISCONNECT = 2,
- H_SETSOURCESTATE = 3,
- H_SETSINKVOLUME = 4,
- H_SETSOURCEVOLUME = 5,
- H_SETSINKSOUNDPROPERTY = 6,
- H_SETSOURCESOUNDPROPERTY = 7,
- H_SETSINKSOUNDPROPERTIES = 8,
- H_SETSOURCESOUNDPROPERTIES = 9,
- H_CROSSFADE = 10,
- H_MAX
- };
-
- /**
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_InterruptState_e
- {
- /**
- * default
- */
- IS_UNKNOWN = 0,
- /**
- * the interrupt state is off - no interrupt
- */
- IS_OFF = 1,
- /**
- * the interrupt state is interrupted - the interrupt is active
- */
- IS_INTERRUPTED = 2,
- IS_MAX
- };
-
- /**
- * describes the active sink of a crossfader.
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- enum am_HotSink_e
- {
- /**
- * default
- */
- HS_UNKNOWN = 0,
- /**
- * sinkA is active
- */
- HS_SINKA = 1,
- /**
- * sinkB is active
- */
- HS_SINKB = 2,
- /**
- * the crossfader is in the transition state
- */
- HS_INTERMEDIATE = 3,
- HS_MAX
- };
-
- /**
- * this describes the availability of a sink or a source together with the latest
- * change
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- struct am_Availability_s
- {
-
- public:
- /**
- * the current availability state
- */
- am_Availability_e availability;
- /**
- * the reason for the last change. This can be used to trigger events that deal
- * with state changes.
- */
- am_AvailabilityReason_e availabilityReason;
-
- };
-
- /**
- * describes class properties
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- struct am_ClassProperty_s
- {
-
- public:
- /**
- * the property as enum
- */
- am_ClassProperty_e classProperty;
- /**
- * the value of the property
- */
- int16_t value;
-
- };
-
- /**
- * This struct describes the attribiutes of a crossfader.
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- struct am_Crossfader_s
- {
-
- public:
- /**
- * This is the ID of the crossfader, it is unique in the system. There are 2 ways,
- * ID can be created: either it is assigned during the registration process (in a
- * dynamic context, uniqueness will be ensured by the AudioManager daemon), or it
- * is a fixed (the project has to ensure the uniqueness of the ID).
- */
- am_crossfaderID_t crossfaderID;
- /**
- * The name of the crossfader. Must be unique in the whole system.
- */
- std::string name;
- /**
- * The sinkID of the SinkA. Sinks shall be registered before registering the
- * crossfader.
- */
- am_sinkID_t sinkID_A;
- /**
- * The sinkID of the SinkB. Sinks shall be registered before registering the
- * crossfader.
- */
- am_sinkID_t sinkID_B;
- /**
- * The sourceID of the crossfader source. The source shall be registered before
- * the crossfader.
- */
- am_sourceID_t sourceID;
- /**
- * This enum can have 3 states:
- *
- * HS_SINKA sinkA is the current hot one, sinkB is not audible
- * HS_SINKB sinkB is the current hot one, sinkB is not audible
- * HS_INTERMEDIATE the fader is stuck in between a cross-fading action. This
- * could be due to an abort or an error. Before using the crossfader, it must be
- * set to either HS_SINKA or HS_SINKB.
- */
- am_HotSink_e hotSink;
-
- };
-
- /**
- * This struct describes the attributes of a gateway.
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- struct am_Gateway_s
- {
-
- public:
- /**
- * This is the ID of the gateway, it is unique in the system. There are 2 ways, ID
- * can be created: either it is assigned during the registration process (in a
- * dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it
- * is a fixed (the project has to ensure the uniqueness of the ID).
- */
- am_gatewayID_t gatewayID;
- /**
- * The name of the gateway. Must be unique in the whole system.
- */
- std::string name;
- /**
- * The sinkID of the gateway sink-end. The sink is a full blown sink with
- * connectionFormats, sinkClassIDs etc... It makes sense to register the sinks of
- * a gateway as non-visible. Care needs to be taken that the connectionsFormats
- * match with the ones in the conversionMatrix. If the sink is located in the
- * controllingDomain, the ID needs to be retrieved by registering the sink before
- * registering the gateway. In case the sink is in a different domain, the ID
- * needs to be retrieved via peeking.
- */
- am_sinkID_t sinkID;
- /**
- * The sourceID of the gateway sink-end. The sink is a full blown source with
- * connectionFormats, sinkClassIDs etc... It makes sense to register the sources
- * of a gateway as non-visible. Care needs to be taken that the connectionsFormats
- * match with the ones in the conversionMatrix. If the source is located in the
- * controllingDomain, the ID needs to be retrieved by registering the source
- * before registering the gateway. In case the source is in a different domain,
- * the ID needs to be retrieved via peeking.
- */
- am_sourceID_t sourceID;
- /**
- * The ID of the sink. If the domain is the same like the controlling domain, the
- * ID is known due to registration. If the domain is different, the ID needs to be
- * retrieved via peeking.
- */
- am_domainID_t domainSinkID;
- /**
- * The ID of the source. If the domain is the same like the controlling domain,
- * the ID is known due to registration. If the domain is different, the ID needs
- * to be retrieved via peeking.
- */
- am_domainID_t domainSourceID;
- /**
- * This is the ID of the domain that registers the gateway.
- */
- am_domainID_t controlDomainID;
- /**
- * This is the list of available formats on the source side of the gateway. It is
- * not defined during the gateway registration but copied from the source
- * registration.
- */
- std::vector<am_ConnectionFormat_e> listSourceFormats;
- /**
- * This is the list of available formats on the sink side of the gateway. It is
- * not defined during the gateway registration but copied from the sink
- * registration.
- */
- std::vector<am_ConnectionFormat_e> listSinkFormats;
- /**
- * This is matrix holding information about the conversion capability of the
- * gateway, it's length is defined by the length(listSinkFormats) x
- * length(listSourceFormats).
- * If a SinkFormat can be converted into a SourceFormat, the vector will hold a 1,
- * if no conversion is possible, a 0.
- * The data is stored row orientated, where the rows are related to the
- * sinksFormats and the columns to the sourceFormats. The first value will hold
- * the conversion information from the first sourceFormat to the first sinkFormat
- * for example and the seventh value the information about the 3rd sinkFormat to
- * the 1st sourceFormat in case we would have 3 sourceFormats.
- *
- * This matrix
- * 110 011 000 111 001
- *
- * reads as this:
- * Source
- * ** 1 2 3
- * *********************
- * S 1* 1 1 0
- * i 2* 0 1 1
- * n 3* 0 0 0
- * k 4* 1 1 1
- * 5* 0 0 1
- */
- std::vector<bool> convertionMatrix;
-
- };
-
- /**
- * This represents one "hopp" in a route
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- struct am_RoutingElement_s
- {
-
- public:
- /**
- * the source ID
- */
- am_sourceID_t sourceID;
- /**
- * the sinkID
- */
- am_sinkID_t sinkID;
- /**
- * the domainID the routeElement is in
- */
- am_domainID_t domainID;
- /**
- * the connectionformat that is used for the route
- */
- am_ConnectionFormat_e connectionFormat;
-
- };
-
- /**
- * a list of routing elements that lead from source to sink
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:14 PM
- */
- struct am_Route_s
- {
-
- public:
- /**
- * the sourceID where the route starts
- */
- am_sourceID_t sourceID;
- /**
- * the sinkID where the route ends
- */
- am_sinkID_t sinkID;
- /**
- * the actual route as list of routing elements
- */
- std::vector<am_RoutingElement_s> route;
-
- };
-
- /**
- * struct describing the sound property
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:15 PM
- */
- struct am_SoundProperty_s
- {
-
- public:
- /**
- * the type of the property - a project specific enum
- */
- am_SoundPropertyType_e type;
- /**
- * the actual value of the property
- */
- int16_t value;
-
- };
-
- /**
- * struct describing system properties
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:15 PM
- */
- struct am_SystemProperty_s
- {
-
- public:
- /**
- * the type that is set
- */
- am_SystemPropertyType_e type;
- /**
- * the value
- */
- int16_t value;
-
- };
-
- /**
- * struct describing sinkclasses
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:15 PM
- */
- struct am_SinkClass_s
- {
-
- public:
- /**
- * the ID of the sinkClass
- */
- am_sinkClass_t sinkClassID;
- /**
- * the name of the sinkClass - must be unique in the system
- */
- std::string name;
- /**
- * the list of the class properties. These are pairs of a project specific enum
- * describing the type of the value and an integer holding the real value.
- */
- std::vector<am_ClassProperty_s> listClassProperties;
-
- };
-
- /**
- * struct describing source classes
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:15 PM
- */
- struct am_SourceClass_s
- {
-
- public:
- /**
- * the source ID
- */
- am_sourceClass_t sourceClassID;
- /**
- * the name of the sourceClass - must be unique in the system
- */
- std::string name;
- /**
- * the list of the class properties. These are pairs of a project specific enum
- * describing the type of the value and an integer holding the real value.
- */
- std::vector<am_ClassProperty_s> listClassProperties;
-
- };
-
- /**
- * this type holds all information of sources relevant to the HMI
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:15 PM
- */
- struct am_SourceType_s
- {
-
- public:
- /**
- * This is the ID of the source, it is unique in the system. There are 2 ways, ID
- * can be created: either it is assigned during the registration process (in a
- * dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it
- * is a fixed (the project has to ensure the uniqueness of the ID).
- */
- am_sourceID_t sourceID;
- /**
- * The name of the source. Must be unique in the whole system.
- */
- std::string name;
- /**
- * the availability of the source
- */
- am_Availability_s availability;
- /**
- * the sourceClassID, indicates the class the source is in. This information can
- * be used by the Controller to implement different behaviour for different
- * classes.
- */
- am_sourceClass_t sourceClassID;
-
- };
-
- /**
- * this type holds all information of sinks relevant to the HMI
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:15 PM
- */
- struct am_SinkType_s
- {
-
- public:
- /**
- * This is the ID of the sink, it is unique in the system. There are 2 ways, ID
- * can be created: either it is assigned during the registration process (in a
- * dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it
- * is a fixed (the project has to ensure the uniqueness of the ID).
- */
- am_sinkID_t sinkID;
- /**
- * The name of the sink. Must be unique in the whole system.
- */
- std::string name;
- /**
- * This attribute reflects the availability of the sink. There are several reasons
- * why a sink could be not available for the moment: for example the shutdown of a
- * sink because of overtemperature or over- & undervoltage. The availability
- * consists of two pieces of information:
- *
- * Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or
- * A_UNKNOWN
- * AvailabilityReason: this informs about the last reason for a change in
- * availability. The reasons itself are product specific.
- */
- am_Availability_s availability;
- /**
- * This is the representation of the Volume for the commandInterface. It is used
- * by the HMI to set the volume of a sink, the AudioManagerController has to
- * transform this into real source and sink volumes.
- */
- am_mainVolume_t volume;
- am_MuteState_e muteState;
- /**
- * The sinkClassID references to a sinkClass. With the help of classification,
- * rules can be setup to define the system behaviour.
- */
- am_sinkClass_t sinkClassID;
-
- };
-
- /**
- * a handle is used for asynchronous operations and is uniquely assigned for each
- * of this operations
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:15 PM
- */
- struct am_Handle_s
- {
-
- public:
- /**
- * the handletype
- */
- am_Handle_e handleType:4;
- /**
- * the handle as value
- */
- uint16_t handle:12;
-
- };
-
- /**
- * struct describung mainsound property
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:15 PM
- */
- struct am_MainSoundProperty_s
- {
-
- public:
- /**
- * the type of the property
- */
- am_MainSoundPropertyType_e type;
- /**
- * the actual value
- */
- int16_t value;
-
- };
-
- /**
- * this type holds all information of connections relevant to the HMI
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:15 PM
- */
- struct am_MainConnectionType_s
- {
-
- public:
- /**
- * the ID of the mainconnection
- */
- am_mainConnectionID_t mainConnectionID;
- /**
- * the sourceID where the connection starts
- */
- am_sourceID_t sourceID;
- /**
- * the sinkID where the connection ends
- */
- am_sinkID_t sinkID;
- /**
- * the delay of the mainconnection
- */
- am_timeSync_t delay;
- /**
- * the current connection state
- */
- am_ConnectionState_e connectionState;
-
- };
-
- /**
- * struct that holds attribiutes of a mainconnection
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:16 PM
- */
- struct am_MainConnection_s
- {
-
- public:
- /**
- * the assigned ID
- */
- am_mainConnectionID_t mainConnectionID;
- /**
- * the current connection state
- */
- am_ConnectionState_e connectionState;
- /**
- * the sinkID
- */
- am_sinkID_t sinkID;
- /**
- * the sourceID
- */
- am_sourceID_t sourceID;
- /**
- * the delay of the connection
- */
- am_timeSync_t delay;
- /**
- * the list of sub connection IDs the mainconnection consists of
- */
- std::vector<am_connectionID_t> listConnectionID;
-
- };
-
- /**
- * This struct describes the attribiutes of a sink
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:16 PM
- */
- struct am_Sink_s
- {
-
- public:
- /**
- * This is the ID of the sink, it is unique in the system. There are 2 ways, ID
- * can be created: either it is assigned during the registration process (in a
- * dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it
- * is a fixed (the project has to ensure the uniqueness of the ID).
- */
- am_sinkID_t sinkID;
- /**
- * The name of the sink. Must be unique in the whole system.
- */
- std::string name;
- /**
- * The domainID is the domain the sink belongs to. A sink can only be in one
- * domain.
- */
- am_domainID_t domainID;
- /**
- * The sinkClassID references to a sinkClass. With the help of classification,
- * rules can be setup to define the system behaviour.
- */
- am_sinkClass_t sinkClassID;
- /**
- * This is the volume of the sink. It is set by the AudioManagerController.
- */
- am_volume_t volume;
- /**
- * This Boolean flag indicates whether a sink is visible to the commandInterface
- * or not. If the User must have the possibility to choose the source in the HMI,
- * it must be visible. But there are also good reasons for invisible sinks, for
- * example if the sink is part of a crossfader or gateway. HMI relevant changes in
- * visible sinks will be automatically reported by the daemon to the
- * commandInterface.
- */
- bool visible;
- /**
- * This attribute reflects the availability of the sink. There are several reasons
- * why a sink could be not available for the moment: for example the shutdown of a
- * sink because of overtemperature or over- & undervoltage. The availability
- * consists of two pieces of information:
- *
- * Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or
- * A_UNKNOWN
- * AvailabilityReason: this informs about the last reason for a change in
- * availability. The reasons itself are product specific.
- */
- am_Availability_s available;
- /**
- * This attribute reflects the muteState of the sink. The information is not the
- * "real" state of the sink, but the HMI representation for he commandInterface
- * controlled by the AudioManagerController.
- */
- am_MuteState_e muteState;
- /**
- * This is the representation of the Volume for the commandInterface. It is used
- * by the HMI to set the volume of a sink, the AudioManagerController has to
- * transform this into real source and sink volumes.
- */
- am_mainVolume_t mainVolume;
- /**
- * This is the list of soundProperties, that the sink is capable of. The
- * soundProperties itself are project specific. For sinks, a possible
- * soundProperty could be for example settings.
- */
- std::vector<am_SoundProperty_s> listSoundProperties;
- /**
- * This list holds information about the formats that the Source is capable of
- * supporting when delivering audio.
- */
- std::vector<am_ConnectionFormat_e> listConnectionFormats;
- /**
- * This is the list of the available mainSoundProperties. The principle is the
- * same than with soundProperties, but they are only visible to the
- * CommandInterface.
- */
- std::vector<am_MainSoundProperty_s> listMainSoundProperties;
-
- };
-
- /**
- * This struct describes the attribiutes of a source
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:16 PM
- */
- struct am_Source_s
- {
-
- public:
- /**
- * This is the ID of the source, it is unique in the system. There are 2 ways, ID
- * can be created: either it is assigned during the registration process (in a
- * dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it
- * is a fixed (the project has to ensure the uniqueness of the ID).
- */
- am_sourceID_t sourceID;
- /**
- * The domainID is the domain the source belongs to. A source can only be in one
- * domain.
- */
- am_domainID_t domainID;
- /**
- * The name of the source. Must be unique in the whole system.
- */
- std::string name;
- /**
- * the sourceClassID, indicates the class the source is in. This information can
- * be used by the Controller to implement different behaviour for different
- * classes.
- */
- am_sourceClass_t sourceClassID;
- /**
- * The source state is an indication towards the source if it is actively heard or
- * not. The source can use this information to implement features like automatic
- * spin down of CD's in case the CD is not the active source or AF following of a
- * tuner that is not actively heard. The source state is set by the
- * AudioManagerController.There are 3 possible states:
- *
- * SS_ON: the source is active
- * SS_OFF: the source is off
- * SS_PAUSED: the source is paused and not active.
- */
- am_SourceState_e sourceState;
- /**
- * This is the volume of the source. It is set by the AudioManagerController. It
- * is used to adopt different audiolevels in a system and mixing of sources (e.g.
- * navigation hints & music).
- */
- am_volume_t volume;
- /**
- * This Boolean flag indicates whether a source is visible to the commandInterface
- * or not. If the User must have the possibility to choose the source in the HMI,
- * it must be visible. But there are also good reasons for invisible sources, for
- * example if the source is part of a crossfader or gateway. HMI relevant changes
- * in visible sources will be automatically reported by the daemon to the
- * commandInterface.
- */
- bool visible;
- /**
- * This attribute reflects the availability of the source. There are several
- * reasons why a source could be not available for the moment. For example a CD
- * player which has no CD entered in the slot can be unavailable, or a USB player
- * with no or unreadable stick attached. Other scenarios involve the shutdown of a
- * source because of overtemperature or over- & undervoltage. The availability
- * consists of two informations:
- *
- * Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or
- * A_UNKNOWN
- * AvailabilityReason: this informs about the last reason for a change in
- * availability. The reasons itself are product specific.
- */
- am_Availability_s available;
- /**
- * Some special sources can have special behaviors, the are so called "Low Level
- * Interrupts". Here the current status is documented. The information can be used
- * by the AudioManagerController to react to the changes by for example lowering
- * the volume of the mainSources. The two states are
- *
- * IS_OFF: the interrupt is not active at the moment
- * IS_INTERRUPTED: the interrupt is playing at the moment.
- */
- am_InterruptState_e interruptState;
- /**
- * This is the list of soundProperties, that the source is capable of. The
- * soundProperties itself are project specific. For sources, a possible
- * soundProperty could be navigation volume offset, for example.
- */
- std::vector<am_SoundProperty_s> listSoundProperties;
- /**
- * This list holds information about the formats that the Source is capable of
- * supporting when delivering audio.
- */
- std::vector<am_ConnectionFormat_e> listConnectionFormats;
- /**
- * This is the list of the available mainSoundProperties. The principle is the
- * same than with soundProperties, but they are only visible to the
- * CommandInterface.
- */
- std::vector<am_MainSoundProperty_s> listMainSoundProperties;
-
- };
-
- /**
- * This struct describes the attribiutes of a domain
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:16 PM
- */
- struct am_Domain_s
- {
-
- public:
- /**
- * the domain ID
- */
- am_domainID_t domainID;
- /**
- * the name of the domain
- */
- std::string name;
- /**
- * the busname. This is equal to a plugin name and is used to dispatch messages to
- * the elements of a plugin
- */
- std::string busname;
- /**
- * the name of the node
- */
- std::string nodename;
- /**
- * indicated if the domain is independent at startup or not
- */
- bool early;
- /**
- * indicates if the domain registration is complete or not
- */
- bool complete;
- /**
- * the current domain state
- */
- am_DomainState_e state;
-
- };
-
- /**
- * a connection
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:16 PM
- */
- struct am_Connection_s
- {
-
- public:
- /**
- * the assigned ID
- */
- am_connectionID_t connectionID;
- /**
- * the source the audio flows from
- */
- am_sourceID_t sourceID;
- /**
- * the sink the audio flows to
- */
- am_sinkID_t sinkID;
- /**
- * the delay of the conneciton
- */
- am_timeSync_t delay;
- /**
- * the used connectionformat
- */
- am_ConnectionFormat_e connectionFormat;
-
- };
-
- /**
- * data type depends of am_EarlyDataType_e:
- * volume_t in case of ED_SOURCE_VOLUME, ED_SINK_VOLUME
- * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:16 PM
- */
- union am_EarlyData_u
- {
-
- public:
- am_volume_t volume;
- am_SoundProperty_s soundProperty;
-
- };
-
- /**
- * data type depends of am_EarlyDataType_e:
- * sourceID in case of ED_SOURCE_VOLUME, ED_SOURCE_PROPERTY
- * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:16 PM
- */
- union am_DataType_u
- {
-
- public:
- am_sinkID_t sink;
- am_sourceID_t source;
-
- };
-
- /**
- * @author Christian Mueller
- * @created 07-Mar-2012 6:06:17 PM
- */
- struct am_EarlyData_s
- {
-
- public:
- am_EarlyDataType_e type;
- am_DataType_u sinksource;
- am_EarlyData_u data;
-
- };
-}
-#endif // !defined(EA_F9B4F59D_FED5_44ac_85F2_F9F60549C133__INCLUDED_)
diff --git a/exampleCode/player/dbushandler.cpp b/exampleCode/player/dbushandler.cpp
deleted file mode 100644
index 1e8cd80..0000000
--- a/exampleCode/player/dbushandler.cpp
+++ /dev/null
@@ -1,742 +0,0 @@
-/**
- * Copyright (C) 2012, BMW AG
- *
- *
- * \copyright
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, version 2
- * of the License.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *
- * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
- *
- *
- */
-#include "dbushandler.h"
-#include <stdio.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dbus/dbus.h>
-#include <glib.h>
-#include <stdint.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <pthread.h>
-
-DBusMessage* DbusHandler::msg;
-DBusMessageIter DbusHandler::args;
-DBusConnection* DbusHandler::conn;
-DBusError DbusHandler::err;
-DBusPendingCall* DbusHandler::pending;
-gboolean DbusHandler:: ret;
-dbus_uint16_t DbusHandler::result;
-GMainLoop* DbusHandler::mainloop;
-
-DbusHandler::DbusHandler()
-{
- dbus_error_init(&err);
- conn = dbus_bus_get(DBUS_BUS_SESSION, &err);
- if (!conn)
- printf("did not get connection error %s", err.message);
- pthread_t thread1;
- int threadid;
- threadid = pthread_create(&thread1,NULL,DbusHandler::Initialize,(void*)this);
-}
-
- DBusHandlerResult DbusHandler::signal_filter(DBusConnection *c, DBusMessage *message, void *user_data)
-{
- fprintf(stderr,"entered into signal_filter\n");
-
- // s_userdata * tempUserdata=static_cast<s_userdata *>(user_data);
- // GMainLoop *loop = tempUserdata->Tempmainloop;
- DbusHandler * tempHandler=static_cast<DbusHandler *>(user_data);
- DBusMessageIter args,args1;
- dbus_uint16_t sink;
-
-
- fprintf(stderr,"received: member %s\n",dbus_message_get_member(message));
-
- if (dbus_message_is_signal(message, "org.genivi.audiomanager", "VolumeChanged"))
- {
- dbus_int16_t Vol;
- fprintf(stderr,"Message customized received\n");
- if (!dbus_message_iter_init(message, &args))
- fprintf(stderr, "VolumeChanged :Message Has No Parameters\n");
- else
- dbus_message_iter_get_basic(&args, &sink);
- if (!dbus_message_iter_next(&args))
- fprintf(stderr, "VolumeChanged :Message has too few arguments!\n");
- else
- dbus_message_iter_get_basic(&args, &Vol);
- emit tempHandler->Volumechanged(sink,Vol);
- fprintf(stderr,"Got Signal with value %d ,%d\n", sink, Vol);
- return DBUS_HANDLER_RESULT_HANDLED;
- }
-
- if (dbus_message_is_signal(message, "org.genivi.audiomanager", "NumberOfMainConnectionsChanged"))
- {
-
- fprintf(stderr,"Message customized received\n");
- emit tempHandler->NumberOfConnectionsChanged();
- return DBUS_HANDLER_RESULT_HANDLED;
- }
- if (dbus_message_is_signal(message, "org.genivi.audiomanager", "MainConnectionStateChanged"))
- {
-
- fprintf(stderr,"Message customized received\n");
- emit tempHandler->NumberOfConnectionsChanged();
- return DBUS_HANDLER_RESULT_HANDLED;
- }
-
- if (dbus_message_is_signal(message, "org.genivi.audiomanager", "SinkMuteStateChanged"))
- {dbus_int16_t mutestate;
- fprintf(stderr,"Message customized received\n");
- if (!dbus_message_iter_init(message, &args))
- fprintf(stderr, "SinkMuteStateChanged :Message Has No Parameters\n");
- else
- dbus_message_iter_get_basic(&args, &sink);
- if (!dbus_message_iter_next(&args))
- fprintf(stderr, "SinkMuteStateChanged :Message has too few arguments!\n");
- else{
- dbus_message_iter_get_basic(&args, &mutestate);
-
- emit tempHandler->Mutestatechanged(sink,static_cast<am_MuteState_e>(mutestate));
- }
- return DBUS_HANDLER_RESULT_HANDLED;
- }
- if (dbus_message_is_signal(message, "org.genivi.audiomanager", "MainSinkSoundPropertyChanged"))
- {dbus_int16_t type,value;
- if (!dbus_message_iter_init(message, &args))
- fprintf(stderr, "SoundProperychanged :Message Has No Parameters\n");
- else
- dbus_message_iter_get_basic(&args, &sink);
- if (!dbus_message_iter_next(&args))
- fprintf(stderr, "SoundProperychanged :Message has too few arguments!\n");
- else
- if (DBUS_TYPE_STRUCT == dbus_message_iter_get_arg_type(&args))
- {
-
- dbus_message_iter_recurse(&args, &args1);
- dbus_message_iter_get_basic(&args1, &type);
- fprintf(stderr, "type :%d\n",type);
- dbus_message_iter_next(&args1);
- dbus_message_iter_get_basic(&args1, &value);
- fprintf(stderr, "value :%d\n",value);
- }
- fprintf(stderr,"Message customized received\n");
- am_MainSoundProperty_s tempsoundproperty;
- tempsoundproperty.type=static_cast<am_MainSoundPropertyType_e>(type);
- tempsoundproperty.value=value;
- emit tempHandler->SoundpropertyChanged(sink,tempsoundproperty);
- return DBUS_HANDLER_RESULT_HANDLED;
- }
-
-
- const char* interface = dbus_message_get_interface(message);
- const char* member = dbus_message_get_member(message);
- const char* path = dbus_message_get_path(message);
- fprintf(stderr,"path %s\n",path);
-
- if (strcmp(member,"asyncSetSourceState")==0)
- {
- uint16_t sourceID=0, handle=0;
- int16_t state=0;
- if (!dbus_message_iter_init(message, &args))
- fprintf(stderr, "asyncSetSourceState :Message Has No Parameters\n");
- else
- dbus_message_iter_get_basic(&args, &handle);
- if (!dbus_message_iter_next(&args))
- fprintf(stderr, "asyncSetSourceState :Message has too few arguments!\n");
- else
- dbus_message_iter_get_basic(&args, &sourceID);
- if (!dbus_message_iter_next(&args))
- fprintf(stderr, "asyncSetSourceState :Message has too few arguments!\n");
- else
- dbus_message_iter_get_basic(&args, &state);
-
- emit tempHandler->SourceActivity(static_cast<am_sourceID_t>(sourceID),static_cast<am_SourceState_e>(state));
- }
- return DBUS_HANDLER_RESULT_HANDLED;
- }
-
-void* DbusHandler::Initialize(void * userdata)
-{
- // DbusHandler * abc =static_cast<DbusHandler *>(userdata);
- static DBusObjectPathVTable vtable_root;
- vtable_root.message_function = signal_filter;
- mainloop = g_main_loop_new(NULL, FALSE);
- dbus_connection_setup_with_g_main (conn, NULL);
- dbus_bus_add_match(conn, "type='signal',interface='org.genivi.audiomanager'", &err);
- dbus_bus_add_match(conn, "sender='org.genivi.audiomanager',member='asyncSetSourceState'", &err);
- if (dbus_error_is_set(&err))
- {
- printf("Match Error (%s)\n", err.message);
- exit(1);
- }
-
- ret = dbus_connection_add_filter(conn,signal_filter,userdata, NULL);
- if (!ret)
- {
- fprintf(stderr,"dbus_connection_add_filter failed");
- }
-
- dbus_connection_flush(conn);
- if (dbus_error_is_set(&err))
- {
- printf("Problem to flush (%s)\n", err.message);
- exit(1);
- }
-
- fprintf(stderr,"Match rule sent\n");
-
- g_main_loop_run (mainloop);
-}
-//-------------------------------------------------------------------------
-int DbusHandler::Sender()
-{
- if (NULL == msg)
- {
- fprintf(stderr, "Message Null\n");
- exit(1);
- }
- //sleep(1);
-
- if (!dbus_connection_send_with_reply(conn, msg, &pending, -1))
- {
- fprintf(stderr, "Sender: Out Of Memory!\n");
- exit(1);
- }
- if (NULL == pending)
- {
- fprintf(stderr, "Pending Call Null\n");
- exit(1);
- }
- dbus_connection_flush(conn);
- printf("Request Sent\n");
-
- dbus_message_unref(msg);
-
- dbus_pending_call_block(pending);
-
- msg = dbus_pending_call_steal_reply(pending);
- if (NULL == msg)
- {
- fprintf(stderr, "Reply Null\n");
- exit(1);
- }
- return 0;
-}
-//---------------------------------------------------------------------
-int DbusHandler::Sender_forlists()
-{
- if (NULL == msg)
- {
- fprintf(stderr, "Message Null\n");
- exit(1);
- }
- sleep(1);
-
- if (!dbus_connection_send_with_reply(conn, msg, &pending, -1))
- {
- fprintf(stderr, "Sender: Out Of Memory!\n");
- exit(1);
- }
- if (NULL == pending)
- {
- fprintf(stderr, "Pending Call Null\n");
- exit(1);
- }
- dbus_connection_flush(conn);
- printf("Request Sent\n");
-
- dbus_message_unref(msg);
-
- dbus_pending_call_block(pending);
-
- msg = dbus_pending_call_steal_reply(pending);
- if (NULL == msg)
- {
- fprintf(stderr, "Reply Null\n");
- exit(1);
- }
- return 0;
-}
-
-//----------------------------------------------------------------
-am_Error_e DbusHandler::connect(am_sourceID_t SourceID,am_sinkID_t SinkID ,am_connectionID_t &ConnectionID)
-{
- msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "Connect");
-
- dbus_message_iter_init_append(msg, &args);
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT16, &SourceID))
- {
- fprintf(stderr, "in Connect 1st Arg Out Of Memory!\n");
- exit(1);
- }
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT16, &SinkID))
- {
- fprintf(stderr, "in Connect 2nd Arg Out Of Memory!\n");
- exit(1);
- }
- Sender();
- dbus_pending_call_unref(pending);
- DBusMessageIter iter1 ;
-
-
- if (!dbus_message_iter_init(msg, &iter1))
- fprintf(stderr, "Message Has No Parameters\n");
- if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
- { printf("Incorrect value recieved %c",dbus_message_iter_get_arg_type(&iter1));
- exit(1);
- }
- dbus_message_iter_get_basic(&iter1, &result);
- fprintf(stderr,"Got result ,%d\n", result);
- dbus_message_iter_next(&iter1);
- if (DBUS_TYPE_UINT16!= dbus_message_iter_get_arg_type(&iter1))
- { printf("Incorrect value recieved %c",dbus_message_iter_get_arg_type(&iter1));
- exit(1);
- }
- dbus_message_iter_get_basic(&iter1, &ConnectionID);
- fprintf(stderr,"Got result ,%d\n", ConnectionID);
-return static_cast <am_Error_e>(result);
-}
-
-////------------------------------------------------------------------------------------
-am_Error_e DbusHandler::disconnect(unsigned int ConnectionID)
-{
- msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "Disconnect");
- dbus_message_iter_init_append(msg, &args);
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT16, &ConnectionID))
- {
- fprintf(stderr, "Out Of Memory!\n");
- exit(1);
- }
- cout<<"Attempting to send"<<endl;
- Sender();
- dbus_pending_call_unref(pending);
- DBusMessageIter iter1 ;
- if (!dbus_message_iter_init(msg, &iter1))
- fprintf(stderr, "Message Has No Parameters\n");
- if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
- { printf("Incorrect value recieved %c",dbus_message_iter_get_arg_type(&iter1));
- exit(1);
- }
- dbus_message_iter_get_basic(&iter1, &result);
- fprintf(stderr,"Got result ,%d\n", result);
- return static_cast <am_Error_e>(result);
-}
-////----------------------------------------------------------------------------
-am_Error_e DbusHandler:: SetVolume(const am_sinkID_t sinkID, const am_mainVolume_t volume)
-{
- msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "SetVolume");
- dbus_message_iter_init_append(msg, &args);
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT16, &sinkID))
- {
- fprintf(stderr, "Out Of Memory!\n");
- exit(1);
- }
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_INT16, &volume))
- {
- fprintf(stderr, "Out Of Memory!\n");
- exit(1);
- }
-
- Sender();
- dbus_pending_call_unref(pending);
- DBusMessageIter iter1 ;
-
-
- if (!dbus_message_iter_init(msg, &iter1))
- fprintf(stderr, "Message Has No Parameters\n");
- if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
- {
- printf("Incorrect value recieved %c",dbus_message_iter_get_arg_type(&iter1));
-
- exit(1);
- }
- dbus_message_iter_get_basic(&iter1, &result);
- fprintf(stderr,"Got result ,%d\n", result);
- return static_cast <am_Error_e>(result);
-}
-////------------------------------------------------------------------------------------------
-
-am_Error_e DbusHandler:: VolumeStep(const am_sinkID_t sinkID, const int16_t volumeStep)
-{msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "VolumeStep");
-dbus_message_iter_init_append(msg, &args);
-if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT16, &sinkID))
-{
- fprintf(stderr, "Out Of Memory!\n");
- exit(1);
-}
-if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_INT16, &volumeStep))
-{
- fprintf(stderr, "Out Of Memory!\n");
- exit(1);
-}
-
-Sender();
-dbus_pending_call_unref(pending);
-DBusMessageIter iter1 ;
-
-
-if (!dbus_message_iter_init(msg, &iter1))
-fprintf(stderr, "Message Has No Parameters\n");
-if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
-{ printf("Incorrect value recieved %c",dbus_message_iter_get_arg_type(&iter1));
-exit(1);
-}
-dbus_message_iter_get_basic(&iter1, &result);
-fprintf(stderr,"Got result ,%d\n", result);
-return static_cast <am_Error_e>(result);
-
-}
-////-----------------------------------------------------------------------------------------
-am_Error_e DbusHandler:: SetSinkMuteState(const am_sinkID_t sinkID, const am_MuteState_e muteState)
-{
- msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "SetSinkMuteState");
- dbus_message_iter_init_append(msg, &args);
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT16, &sinkID))
- {
- fprintf(stderr, "Out Of Memory!\n");
- exit(1);
- }
- int temp_mutestate = static_cast<int>(muteState);
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_INT16, &temp_mutestate))
- {
- fprintf(stderr, "Out Of Memory!\n");
- exit(1);
- }
-
- Sender();
- dbus_pending_call_unref(pending);
- DBusMessageIter iter1 ;
-
-
- if (!dbus_message_iter_init(msg, &iter1))
- fprintf(stderr, "Message Has No Parameters\n");
- if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
- { printf("Incorrect value recieved %c",dbus_message_iter_get_arg_type(&iter1));
- exit(1);
- }
- dbus_message_iter_get_basic(&iter1, &result);
- fprintf(stderr,"Got result ,%d\n", result);
- return static_cast <am_Error_e>(result);
-
-
-}
-////---------------------------------------------------------------------------------------------------
-am_Error_e DbusHandler ::SetMainSinkSoundProperty(const am_sinkID_t sinkID, const am_MainSoundProperty_s &soundProperty)
-{
- msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "SetMainSinkSoundProperty");
- dbus_message_iter_init_append(msg, &args);
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT16, &sinkID))
- {
- fprintf(stderr, "Out Of Memory!\n");
- exit(1);
- }
- DBusMessageIter structIter;
- dbus_bool_t success = true;
- dbus_message_iter_open_container(&args, DBUS_TYPE_STRUCT, NULL, &structIter);
- success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &soundProperty.type);
- success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &soundProperty.value);
- success = success && dbus_message_iter_close_container(&args, &structIter);
-
- Sender();
- dbus_pending_call_unref(pending);
- DBusMessageIter iter1 ;
- if (!dbus_message_iter_init(msg, &iter1))
- fprintf(stderr, "Message Has No Parameters\n");
- if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
- { printf("Incorrect value recieved %c",dbus_message_iter_get_arg_type(&iter1));
- char * abc;
- dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &abc);
- printf("Incorrect value recieved %s",abc);
- exit(1);
- }
- dbus_message_iter_get_basic(&iter1, &result);
- fprintf(stderr,"Got result ,%d\n", result);
- return static_cast <am_Error_e>(result);
-
-
-}
-////----------------------------------------------------------------------------------------------------------------------
-am_Error_e DbusHandler::GetListMainConnections(std::vector<am_MainConnectionType_s *> &listConnections)
-{
- msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "GetListMainConnections");
- Sender();
- dbus_pending_call_unref(pending);
- DBusMessageIter subIter,iter1,iter2 ;
- if (!dbus_message_iter_init(msg, &iter1))
- fprintf(stderr, "Message Has No Parameters\n");
- if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
- { printf("Incorrect value recieved");
- exit(1);
- }
- dbus_message_iter_get_basic(&iter1, &result);
- fprintf(stderr,"Got result ,%d\n", result);
- dbus_message_iter_next(&iter1);
- if (DBUS_TYPE_ARRAY== dbus_message_iter_get_arg_type(&iter1))
- { // fprintf(stderr, "a:%d\n", a);
- for (dbus_message_iter_recurse(&iter1, &iter2);
- dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INVALID;
- dbus_message_iter_next(&iter2))
- {
- am_MainConnectionType_s* TempConnection= new am_MainConnectionType_s();
- if (DBUS_TYPE_STRUCT == dbus_message_iter_get_arg_type(&iter2))
- {
- dbus_message_iter_recurse(&iter2, &subIter);
- dbus_uint16_t ConnID,SourceID,SinkID;
- dbus_int16_t Timedelay,ConnectionState;
- dbus_message_iter_get_basic(&subIter, &ConnID);
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &SourceID);
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &SinkID);
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &Timedelay);
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &ConnectionState);
- dbus_message_iter_next(&subIter);
-
- {
- TempConnection->mainConnectionID=ConnID;
- TempConnection->sourceID=SourceID;
- TempConnection->sinkID=SinkID;
- TempConnection->delay=Timedelay;
- TempConnection->connectionState=static_cast<am_ConnectionState_e>(ConnectionState);
- listConnections.push_back(TempConnection);
- }
- }
-
- }
- }
-
-
-
-return static_cast <am_Error_e>(result);
-}
-////------------------------------------------------------------Rossini--------------------------------------------------
-am_Error_e DbusHandler::GetListMainSinks(std::vector<am_SinkType_s> &listSinks)
-{ msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "GetListMainSinks");
-
- Sender();
- dbus_pending_call_unref(pending);
- DBusMessageIter subIter,iter1,iter2,subsubiter ;
-
- if (!dbus_message_iter_init(msg, &iter1))
- fprintf(stderr, "Message Has No Parameters\n");
- if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
- { printf("Incorrect value recieved");
- exit(1);
- }
- dbus_message_iter_get_basic(&iter1, &result);
- fprintf(stderr,"Got result ,%d\n", result);
- dbus_message_iter_next(&iter1);
- if (DBUS_TYPE_ARRAY== dbus_message_iter_get_arg_type(&iter1))
- { // fprintf(stderr, "a:%d\n", a);
- for (dbus_message_iter_recurse(&iter1, &iter2);
- dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INVALID;
- dbus_message_iter_next(&iter2))
- {
- am_SinkType_s TempSink;
- if (DBUS_TYPE_STRUCT == dbus_message_iter_get_arg_type(&iter2))
- {
- dbus_message_iter_recurse(&iter2, &subIter);
- dbus_uint16_t SinkID,SinkClassID,availability,availability_reason,volume,mute_state;
- char* Sinkname;
- dbus_message_iter_get_basic(&subIter, &SinkID);
- //fprintf(stderr, "sourceID:%d\n",sourceID);
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &Sinkname);
- //fprintf(stderr, "name :%s\n",sourcename);
- dbus_message_iter_next(&subIter);
- if (DBUS_TYPE_STRUCT == dbus_message_iter_get_arg_type(&subIter))
- {
- dbus_message_iter_recurse(&subIter, &subsubiter);
- dbus_message_iter_get_basic(&subsubiter, &availability);
- fprintf(stderr, "availability value:%d\n",availability);
- dbus_message_iter_next(&subsubiter);
- dbus_message_iter_get_basic(&subsubiter, &availability_reason);
- fprintf(stderr, "availability reason value:%d\n",availability_reason);
- }
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &volume);
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &mute_state);
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &SinkClassID);
- fprintf(stderr, "muteState value:%d\n",SinkClassID);
- fprintf(stderr, "*****************************************\n");
- TempSink.sinkID=SinkID;
- TempSink.name=Sinkname;
- TempSink.availability.availability=static_cast<am_Availability_e>(availability);
- TempSink.availability.availabilityReason=static_cast<am_AvailabilityReason_e>(availability_reason);
- TempSink.sinkClassID=SinkClassID;
- TempSink.volume=volume;
- TempSink.muteState=static_cast<am_MuteState_e>(mute_state);
- listSinks.push_back(TempSink);
- }
-
- }
- }
- return static_cast <am_Error_e>(result);
-}
-////-------------------------------------------------------------------------------------------------
-
-am_Error_e DbusHandler::GetListMainSources(std::vector<am_SourceType_s> &listSources)
-{
-
- msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "GetListMainSources");
-
- Sender_forlists();
- dbus_pending_call_unref(pending);
- DBusMessageIter subIter,iter1,iter2,subsubiter ;
- dbus_bool_t success = true;
- if (!dbus_message_iter_init(msg, &iter1))
- fprintf(stderr, "Message Has No Parameters\n");
- if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
- { printf("Incorrect value recieved");
- exit(1);
- }
- dbus_message_iter_get_basic(&iter1, &result);
- fprintf(stderr,"Got result ,%d\n", result);
- dbus_message_iter_next(&iter1);
- if (DBUS_TYPE_ARRAY== dbus_message_iter_get_arg_type(&iter1))
- { // fprintf(stderr, "a:%d\n", a);
- for (dbus_message_iter_recurse(&iter1, &iter2);
- dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INVALID;
- dbus_message_iter_next(&iter2))
- {
- am_SourceType_s TempSource;
-
- if (DBUS_TYPE_STRUCT == dbus_message_iter_get_arg_type(&iter2))
- {
- dbus_message_iter_recurse(&iter2, &subIter);
- dbus_uint16_t sourceID,SourceClassID,availability,availability_reason;
- char* sourcename;
- dbus_message_iter_get_basic(&subIter, &sourceID);
- //fprintf(stderr, "sourceID:%d\n",sourceID);
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &sourcename);
- //fprintf(stderr, "name :%s\n",sourcename);
- dbus_message_iter_next(&subIter);
- if (DBUS_TYPE_STRUCT == dbus_message_iter_get_arg_type(&subIter))
- {
- dbus_message_iter_recurse(&subIter, &subsubiter);
- dbus_message_iter_get_basic(&subsubiter, &availability);
- fprintf(stderr, "availability value:%d\n",availability);
- dbus_message_iter_next(&subsubiter);
- dbus_message_iter_get_basic(&subsubiter, &availability_reason);
- fprintf(stderr, "availability reason value:%d\n",availability_reason);
- }
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &SourceClassID);
- fprintf(stderr, "muteState value:%d\n",SourceClassID);
- fprintf(stderr, "*****************************************\n");
- TempSource.sourceID=sourceID;
- TempSource.name=sourcename;
- TempSource.availability.availability=static_cast<am_Availability_e>(availability);
- TempSource.availability.availabilityReason=static_cast<am_AvailabilityReason_e>(availability_reason);
- TempSource.sourceClassID=SourceClassID;
- listSources.push_back(TempSource);
- }
-
- }
- }
- return static_cast <am_Error_e>(result);
-}
-
-
-////--------------------------------------------------------------------------------------------------------------------
-am_Error_e DbusHandler::GetListMainSinkSoundProperties(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s *> &listSoundProperties)
-{ msg = dbus_message_new_method_call("org.genivi.audiomanager", // target for the method call
- "/org/genivi/audiomanager/CommandInterface", // object to call on
- "org.genivi.audiomanager.CommandInterface", // interface to call on
- "GetListMainSinkSoundProperties");
-
-
- dbus_message_iter_init_append(msg, &args);
- if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_UINT16, &sinkID))
- {
- fprintf(stderr, "GetListMainSinkSoundProperties Out Of Memory!\n");
- exit(1);
- }
- Sender();
- dbus_pending_call_unref(pending);
- DBusMessageIter subIter,iter1,iter2 ;
-
- if (!dbus_message_iter_init(msg, &iter1))
- fprintf(stderr, "Message Has No Parameters\n");
- if (DBUS_TYPE_INT16!= dbus_message_iter_get_arg_type(&iter1))
- { printf("Incorrect value recieved,%c",dbus_message_iter_get_arg_type(&iter1));
- exit(1);
- }
-
- dbus_message_iter_get_basic(&iter1, &result);
-
- dbus_message_iter_next(&iter1);
- if (DBUS_TYPE_ARRAY== dbus_message_iter_get_arg_type(&iter1))
- { // fprintf(stderr, "a:%d\n", a);
- for (dbus_message_iter_recurse(&iter1, &iter2);
- dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INVALID;
- dbus_message_iter_next(&iter2))
- {am_MainSoundProperty_s* SoundProperty= new am_MainSoundProperty_s();
-
- if (DBUS_TYPE_STRUCT == dbus_message_iter_get_arg_type(&iter2))
- {
- dbus_message_iter_recurse(&iter2, &subIter);
- dbus_uint16_t Type,Value;
- dbus_message_iter_get_basic(&subIter, &Type);
- //fprintf(stderr, "sourceID:%d\n",sourceID);
- dbus_message_iter_next(&subIter);
- dbus_message_iter_get_basic(&subIter, &Value);
- SoundProperty->type=static_cast<am_MainSoundPropertyType_e>(Type);
- SoundProperty->value=Value;
- listSoundProperties.push_back(SoundProperty);
- }
-
- }
- }
- return static_cast <am_Error_e>(result);
-
-}
-
diff --git a/exampleCode/player/dbushandler.h b/exampleCode/player/dbushandler.h
deleted file mode 100644
index 884f8c1..0000000
--- a/exampleCode/player/dbushandler.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef DBUSHANDLER_H
-#define DBUSHANDLER_H
-
-/**
- * Copyright (C) 2012, BMW AG
- *
- *
- * \copyright
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, version 2
- * of the License.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *
- * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
- * \author Sruthi Mohan
- *
- *
- */
-
-/**
- * This is the Class that handles dbus message message communication.
- * This is implemented using glib-dbus-c binding
- * @author Sruthi Mohan
- * @version 1.0
- * @created 10-Feb-2012 1:31:06 PM
- */
-#include <stdio.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dbus/dbus.h>
-#include <glib.h>
-#include <stdint.h>
-#include <dbus/dbus-glib.h>
-#include "audiomanagertypes.h"
-#include <dbus/dbus-glib-bindings.h>
-#include <QObject>
-#include <iostream>
-#include <vector>
-
-#define SERVICE_NAME "org.genivi.audiomanager"
-#define PATH_NAME "/org/genivi/audiomanager/CommandInterface"
-#define INTERFACENAME "org.genivi.audiomanager.CommandInterface"
-
-using namespace std;
-using namespace am;
-class AudiomanagerHMIController;
-
-class DbusHandler : public QObject
-{
- Q_OBJECT
-public:
- explicit DbusHandler();
-signals:
- void NumberOfConnectionsChanged();
- void Volumechanged(am_sinkID_t,am_volume_t);
- void SoundpropertyChanged(am_sinkID_t,am_MainSoundProperty_s);
- void Mutestatechanged(am_sinkID_t,am_MuteState_e);
- void SourceActivity(am_sourceID_t source,am_SourceState_e state);
-public slots:
- static void* Initialize(void*);
- int Sender();
- int Sender_forlists();
- am_Error_e connect(am_sourceID_t SourceID,am_sinkID_t SinkID ,am_connectionID_t &ConnectionID);
- am_Error_e disconnect(unsigned int ConnectionID);
- am_Error_e SetVolume(const am_sinkID_t sinkID, const am_mainVolume_t volume) ;
- am_Error_e VolumeStep(const am_sinkID_t sinkID, const int16_t volumeStep) ;
- am_Error_e SetSinkMuteState(const am_sinkID_t sinkID, const am_MuteState_e muteState) ;
- am_Error_e SetMainSinkSoundProperty( const am_sinkID_t sinkID,const am_MainSoundProperty_s& soundProperty) ;
- am_Error_e GetListMainConnections(std::vector<am_MainConnectionType_s* >& listConnections) ;
- am_Error_e GetListMainSinks(std::vector<am_SinkType_s>& listSinks) ;
- am_Error_e GetListMainSources(std::vector<am_SourceType_s>& listSources) ;
- am_Error_e GetListMainSinkSoundProperties(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s*>& listSoundProperties) ;
- static DBusHandlerResult signal_filter(DBusConnection *c, DBusMessage *message, void *user_data);
-
-private:
- static DBusMessage* msg;
- static DBusMessageIter args;
- static DBusConnection* conn;
- static DBusError err;
- static DBusPendingCall* pending;
- static gboolean ret;
- static dbus_uint16_t result;
- static GMainLoop* mainloop;
-};
-struct s_userdata
-{
- GMainLoop* Tempmainloop;
- DbusHandler *ptrDbusHanndler;
-};
-
-#endif // DBUSHANDLER_H
diff --git a/exampleCode/player/images/screen.png b/exampleCode/player/images/screen.png
deleted file mode 100644
index a15df92..0000000
--- a/exampleCode/player/images/screen.png
+++ /dev/null
Binary files differ
diff --git a/exampleCode/player/main.cpp b/exampleCode/player/main.cpp
deleted file mode 100644
index 20cc021..0000000
--- a/exampleCode/player/main.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** GNU General Public License Usage
-** This file is licensed under GPL v2.
-**
-**
-** $QT_END_LICENSE$
-**
-***************************************************************************/
-
-#include <QtGui>
-#include "mediaplayer.h"
-#include "dbushandler.h"
-#include "audiomanagerinteractor.h"
-
-const qreal DefaultVolume = -1.0;
-
-int main (int argc, char *argv[])
-{
- Q_INIT_RESOURCE(mediaplayer);
- QApplication app(argc, argv);
-
- QStringList args = app.arguments();
- app.setApplicationName(args.at(1));
- std::string appName=args.at(1).toStdString();
- std::string targetName=args.at(2).toStdString();
-
- app.setOrganizationName("Genivi");
- app.setQuitOnLastWindowClosed(true);
-
- QString fileName;
- qreal volume = DefaultVolume;
- bool smallScreen = false;
-#ifdef Q_OS_SYMBIAN
- smallScreen = true;
-#endif
-
- am_sourceID_t mySourceID=0;
- am_sinkID_t targetSinkID=0;
-
- DbusHandler dbusHandler;
-
- //first we need to find out our sourceID
- std::vector<am_SourceType_s> listSources;
- std::vector<am_SinkType_s> listSinks;
- dbusHandler.GetListMainSources(listSources);
- dbusHandler.GetListMainSinks(listSinks);
-
- std::vector<am_SourceType_s>::iterator sourceIter(listSources.begin());
- for (;sourceIter!=listSources.end();++sourceIter)
- {
- if (sourceIter->name.compare(appName)==0)
- mySourceID=sourceIter->sourceID;
- }
-
- std::vector<am_SinkType_s>::iterator sinkIter(listSinks.begin());
- for (;sinkIter!=listSinks.end();++sinkIter)
- {
-
- if (sinkIter->name.compare(targetName)==0)
- targetSinkID=sinkIter->sinkID;
- }
-
- std::cout<< "SourceID "<<mySourceID<<std::endl;
-
- QString appNameSourceID=args.at(1)+" sourceID="+QString::number(mySourceID);
-
- AudioManagerInteractor interActor(&dbusHandler,mySourceID,targetSinkID);
-
-
- MediaPlayer player(appNameSourceID);
- player.setSmallScreen(smallScreen);
- if (DefaultVolume != volume)
- player.setVolume(volume);
- if (!fileName.isNull())
- player.setFile(fileName);
-
- if (smallScreen)
- player.showMaximized();
- else
- player.show();
-
- QObject::connect((const QObject*)player.playButton, SIGNAL(clicked()),&interActor, SLOT(playPause()));
- QObject::connect((const QObject*)&dbusHandler, SIGNAL(SourceActivity(am_sourceID_t ,am_SourceState_e )),&interActor, SLOT(SourceActivity(am_sourceID_t ,am_SourceState_e )));
- QObject::connect((const QObject*)&interActor, SIGNAL(play()),&player, SLOT(play()));
- QObject::connect((const QObject*)&interActor, SIGNAL(stop()),&player, SLOT(stop()));
- QObject::connect((const QObject*)&player, SIGNAL(MediaStateChanged(Phonon::State)),&interActor, SLOT(getPlayerState(Phonon::State)));
-
- return app.exec();
-}
-
diff --git a/exampleCode/player/mainwindow.cpp b/exampleCode/player/mainwindow.cpp
deleted file mode 100755
index 49d64fc..0000000
--- a/exampleCode/player/mainwindow.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
-
-MainWindow::MainWindow(QWidget *parent) :
- QMainWindow(parent),
- ui(new Ui::MainWindow)
-{
- ui->setupUi(this);
-}
-
-MainWindow::~MainWindow()
-{
- delete ui;
-}
diff --git a/exampleCode/player/mainwindow.h b/exampleCode/player/mainwindow.h
deleted file mode 100755
index dc809f8..0000000
--- a/exampleCode/player/mainwindow.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QMainWindow>
-
-namespace Ui {
-class MainWindow;
-}
-
-class MainWindow : public QMainWindow
-{
- Q_OBJECT
-
-public:
- explicit MainWindow(QWidget *parent = 0);
- ~MainWindow();
-
-private:
- Ui::MainWindow *ui;
-};
-
-#endif // MAINWINDOW_H
diff --git a/exampleCode/player/mainwindow.ui b/exampleCode/player/mainwindow.ui
deleted file mode 100755
index 6050363..0000000
--- a/exampleCode/player/mainwindow.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>300</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>MainWindow</string>
- </property>
- <widget class="QMenuBar" name="menuBar" />
- <widget class="QToolBar" name="mainToolBar" />
- <widget class="QWidget" name="centralWidget" />
- <widget class="QStatusBar" name="statusBar" />
- </widget>
- <layoutDefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
- <resources/>
- <connections/>
-</ui>
diff --git a/exampleCode/player/mediaplayer.cpp b/exampleCode/player/mediaplayer.cpp
deleted file mode 100644
index 1939585..0000000
--- a/exampleCode/player/mediaplayer.cpp
+++ /dev/null
@@ -1,970 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** GNU General Public License Usage
-** This file is licensed under GPL v2.
-**
-**
-** $QT_END_LICENSE$
-**
-***************************************************************************/
-
-#include <QtGui>
-
-#define SLIDER_RANGE 8
-
-#include "mediaplayer.h"
-#include "ui_settings.h"
-
-#ifdef Q_OS_SYMBIAN
-#include <cdbcols.h>
-#include <cdblen.h>
-#include <commdb.h>
-#endif
-
-MediaVideoWidget::MediaVideoWidget(MediaPlayer *player, QWidget *parent) :
- Phonon::VideoWidget(parent), m_player(player), m_action(this)
-{
- m_action.setCheckable(true);
- m_action.setChecked(false);
- m_action.setShortcut(QKeySequence( Qt::AltModifier + Qt::Key_Return));
- m_action.setShortcutContext(Qt::WindowShortcut);
- connect(&m_action, SIGNAL(toggled(bool)), SLOT(setFullScreen(bool)));
- addAction(&m_action);
- setAcceptDrops(true);
-}
-
-void MediaVideoWidget::setFullScreen(bool enabled)
-{
- Phonon::VideoWidget::setFullScreen(enabled);
- emit fullScreenChanged(enabled);
-}
-
-void MediaVideoWidget::mouseDoubleClickEvent(QMouseEvent *e)
-{
- Phonon::VideoWidget::mouseDoubleClickEvent(e);
- setFullScreen(!isFullScreen());
-}
-
-void MediaVideoWidget::keyPressEvent(QKeyEvent *e)
-{
- if(!e->modifiers()) {
- // On non-QWERTY Symbian key-based devices, there is no space key.
- // The zero key typically is marked with a space character.
- if (e->key() == Qt::Key_Space || e->key() == Qt::Key_0) {
- //m_player->playPause();
- e->accept();
- return;
- }
-
- // On Symbian devices, there is no key which maps to Qt::Key_Escape
- // On devices which lack a backspace key (i.e. non-QWERTY devices),
- // the 'C' key maps to Qt::Key_Backspace
- else if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Backspace) {
- setFullScreen(false);
- e->accept();
- return;
- }
- }
- Phonon::VideoWidget::keyPressEvent(e);
-}
-
-bool MediaVideoWidget::event(QEvent *e)
-{
- switch(e->type())
- {
- case QEvent::Close:
- //we just ignore the cose events on the video widget
- //this prevents ALT+F4 from having an effect in fullscreen mode
- e->ignore();
- return true;
- case QEvent::MouseMove:
-#ifndef QT_NO_CURSOR
- unsetCursor();
-#endif
- //fall through
- case QEvent::WindowStateChange:
- {
- //we just update the state of the checkbox, in case it wasn't already
- m_action.setChecked(windowState() & Qt::WindowFullScreen);
- const Qt::WindowFlags flags = m_player->windowFlags();
- if (windowState() & Qt::WindowFullScreen) {
- m_timer.start(1000, this);
- } else {
- m_timer.stop();
-#ifndef QT_NO_CURSOR
- unsetCursor();
-#endif
- }
- }
- break;
- default:
- break;
- }
-
- return Phonon::VideoWidget::event(e);
-}
-
-void MediaVideoWidget::timerEvent(QTimerEvent *e)
-{
- if (e->timerId() == m_timer.timerId()) {
- //let's store the cursor shape
-#ifndef QT_NO_CURSOR
- setCursor(Qt::BlankCursor);
-#endif
- }
- Phonon::VideoWidget::timerEvent(e);
-}
-
-void MediaVideoWidget::dropEvent(QDropEvent *e)
-{
- m_player->handleDrop(e);
-}
-
-void MediaVideoWidget::dragEnterEvent(QDragEnterEvent *e) {
- if (e->mimeData()->hasUrls())
- e->acceptProposedAction();
-}
-
-
-MediaPlayer::MediaPlayer(QString AppName) :
- playButton(0), nextEffect(0), settingsDialog(0), ui(0),
- m_AudioOutput(Phonon::VideoCategory),
- m_videoWidget(new MediaVideoWidget(this))
-{
- setWindowTitle(AppName);
- setContextMenuPolicy(Qt::CustomContextMenu);
- m_videoWidget->setContextMenuPolicy(Qt::CustomContextMenu);
-
- QSize buttonSize(34, 28);
-
- QPushButton *openButton = new QPushButton(this);
-
- openButton->setIcon(style()->standardIcon(QStyle::SP_DialogOpenButton));
- QPalette bpal;
- QColor arrowcolor = bpal.buttonText().color();
- if (arrowcolor == Qt::black)
- arrowcolor = QColor(80, 80, 80);
- bpal.setBrush(QPalette::ButtonText, arrowcolor);
- openButton->setPalette(bpal);
-
- rewindButton = new QPushButton(this);
- rewindButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipBackward));
-
- forwardButton = new QPushButton(this);
- forwardButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipForward));
- forwardButton->setEnabled(false);
-
- playButton = new QPushButton(this);
- playIcon = style()->standardIcon(QStyle::SP_MediaPlay);
- pauseIcon = style()->standardIcon(QStyle::SP_MediaPause);
- playButton->setIcon(playIcon);
-
- slider = new Phonon::SeekSlider(this);
- slider->setMediaObject(&m_MediaObject);
- volume = new Phonon::VolumeSlider(&m_AudioOutput);
-
- QVBoxLayout *vLayout = new QVBoxLayout(this);
- vLayout->setContentsMargins(8, 8, 8, 8);
-
- QHBoxLayout *layout = new QHBoxLayout();
-
- info = new QLabel(this);
- info->setMinimumHeight(70);
- info->setAcceptDrops(false);
- info->setMargin(2);
- info->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
- info->setLineWidth(2);
- info->setAutoFillBackground(true);
-
- QPalette palette;
- palette.setBrush(QPalette::WindowText, Qt::white);
-#ifndef Q_WS_MAC
- openButton->setMinimumSize(54, buttonSize.height());
- rewindButton->setMinimumSize(buttonSize);
- forwardButton->setMinimumSize(buttonSize);
- playButton->setMinimumSize(buttonSize);
-#endif
- info->setStyleSheet("border-image:url(:/images/screen.png) ; border-width:3px");
- info->setPalette(palette);
- info->setText(tr("<center>No media</center>"));
-
- volume->setFixedWidth(120);
-
- layout->addWidget(openButton);
- layout->addWidget(rewindButton);
- layout->addWidget(playButton);
- layout->addWidget(forwardButton);
-
- layout->addStretch();
- layout->addWidget(volume);
-
- vLayout->addWidget(info);
- initVideoWindow();
- vLayout->addWidget(&m_videoWindow);
- QVBoxLayout *buttonPanelLayout = new QVBoxLayout();
- m_videoWindow.hide();
- buttonPanelLayout->addLayout(layout);
-
- timeLabel = new QLabel(this);
- progressLabel = new QLabel(this);
- QWidget *sliderPanel = new QWidget(this);
- QHBoxLayout *sliderLayout = new QHBoxLayout();
- sliderLayout->addWidget(slider);
- sliderLayout->addWidget(timeLabel);
- sliderLayout->addWidget(progressLabel);
- sliderLayout->setContentsMargins(0, 0, 0, 0);
- sliderPanel->setLayout(sliderLayout);
-
- buttonPanelLayout->addWidget(sliderPanel);
- buttonPanelLayout->setContentsMargins(0, 0, 0, 0);
-#ifdef Q_OS_MAC
- layout->setSpacing(4);
- buttonPanelLayout->setSpacing(0);
- info->setMinimumHeight(100);
- info->setFont(QFont("verdana", 15));
- // QStyle *flatButtonStyle = new QWindowsStyle;
- openButton->setFocusPolicy(Qt::NoFocus);
- // openButton->setStyle(flatButtonStyle);
- // playButton->setStyle(flatButtonStyle);
- // rewindButton->setStyle(flatButtonStyle);
- // forwardButton->setStyle(flatButtonStyle);
- #endif
- QWidget *buttonPanelWidget = new QWidget(this);
- buttonPanelWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
- buttonPanelWidget->setLayout(buttonPanelLayout);
- vLayout->addWidget(buttonPanelWidget);
-
- QHBoxLayout *labelLayout = new QHBoxLayout();
-
- vLayout->addLayout(labelLayout);
- setLayout(vLayout);
-
- // Create menu bar:
- fileMenu = new QMenu(this);
- QAction *openFileAction = fileMenu->addAction(tr("Open &File..."));
- QAction *openUrlAction = fileMenu->addAction(tr("Open &Location..."));
-#ifdef Q_OS_SYMBIAN
- QAction *selectIAPAction = fileMenu->addAction(tr("Select &IAP..."));
- connect(selectIAPAction, SIGNAL(triggered(bool)), this, SLOT(selectIAP()));
-#endif
- QAction *const openLinkAction = fileMenu->addAction(tr("Open &RAM File..."));
-
- connect(openLinkAction, SIGNAL(triggered(bool)), this, SLOT(openRamFile()));
-
- fileMenu->addSeparator();
- QMenu *aspectMenu = fileMenu->addMenu(tr("&Aspect ratio"));
- QActionGroup *aspectGroup = new QActionGroup(aspectMenu);
- connect(aspectGroup, SIGNAL(triggered(QAction*)), this, SLOT(aspectChanged(QAction*)));
- aspectGroup->setExclusive(true);
- QAction *aspectActionAuto = aspectMenu->addAction(tr("Auto"));
- aspectActionAuto->setCheckable(true);
- aspectActionAuto->setChecked(true);
- aspectGroup->addAction(aspectActionAuto);
- QAction *aspectActionScale = aspectMenu->addAction(tr("Scale"));
- aspectActionScale->setCheckable(true);
- aspectGroup->addAction(aspectActionScale);
- QAction *aspectAction16_9 = aspectMenu->addAction(tr("16/9"));
- aspectAction16_9->setCheckable(true);
- aspectGroup->addAction(aspectAction16_9);
- QAction *aspectAction4_3 = aspectMenu->addAction(tr("4/3"));
- aspectAction4_3->setCheckable(true);
- aspectGroup->addAction(aspectAction4_3);
-
- QMenu *scaleMenu = fileMenu->addMenu(tr("&Scale mode"));
- QActionGroup *scaleGroup = new QActionGroup(scaleMenu);
- connect(scaleGroup, SIGNAL(triggered(QAction*)), this, SLOT(scaleChanged(QAction*)));
- scaleGroup->setExclusive(true);
- QAction *scaleActionFit = scaleMenu->addAction(tr("Fit in view"));
- scaleActionFit->setCheckable(true);
- scaleActionFit->setChecked(true);
- scaleGroup->addAction(scaleActionFit);
- QAction *scaleActionCrop = scaleMenu->addAction(tr("Scale and crop"));
- scaleActionCrop->setCheckable(true);
- scaleGroup->addAction(scaleActionCrop);
-
- m_fullScreenAction = fileMenu->addAction(tr("Full screen video"));
- m_fullScreenAction->setCheckable(true);
- m_fullScreenAction->setEnabled(false); // enabled by hasVideoChanged
- bool b = connect(m_fullScreenAction, SIGNAL(toggled(bool)), m_videoWidget, SLOT(setFullScreen(bool)));
- Q_ASSERT(b);
- b = connect(m_videoWidget, SIGNAL(fullScreenChanged(bool)), m_fullScreenAction, SLOT(setChecked(bool)));
- Q_ASSERT(b);
-
- fileMenu->addSeparator();
- QAction *settingsAction = fileMenu->addAction(tr("&Settings..."));
-
- // Setup signal connections:
- connect(rewindButton, SIGNAL(clicked()), this, SLOT(rewind()));
- //connect(openButton, SIGNAL(clicked()), this, SLOT(openFile()));
- openButton->setMenu(fileMenu);
-
- //connect(playButton, SIGNAL(clicked()), this, SLOT(playPause()));
- connect(forwardButton, SIGNAL(clicked()), this, SLOT(forward()));
- //connect(openButton, SIGNAL(clicked()), this, SLOT(openFile()));
- connect(settingsAction, SIGNAL(triggered(bool)), this, SLOT(showSettingsDialog()));
- connect(openUrlAction, SIGNAL(triggered(bool)), this, SLOT(openUrl()));
- connect(openFileAction, SIGNAL(triggered(bool)), this, SLOT(openFile()));
-
- connect(m_videoWidget, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showContextMenu(const QPoint &)));
- connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showContextMenu(const QPoint &)));
- connect(&m_MediaObject, SIGNAL(metaDataChanged()), this, SLOT(updateInfo()));
- connect(&m_MediaObject, SIGNAL(totalTimeChanged(qint64)), this, SLOT(updateTime()));
- connect(&m_MediaObject, SIGNAL(tick(qint64)), this, SLOT(updateTime()));
- connect(&m_MediaObject, SIGNAL(finished()), this, SLOT(finished()));
- connect(&m_MediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(stateChanged(Phonon::State,Phonon::State)));
- connect(&m_MediaObject, SIGNAL(bufferStatus(int)), this, SLOT(bufferStatus(int)));
- connect(&m_MediaObject, SIGNAL(hasVideoChanged(bool)), this, SLOT(hasVideoChanged(bool)));
-
- rewindButton->setEnabled(false);
- playButton->setEnabled(false);
- setAcceptDrops(true);
-
- m_audioOutputPath = Phonon::createPath(&m_MediaObject, &m_AudioOutput);
- Phonon::createPath(&m_MediaObject, m_videoWidget);
-
- resize(minimumSizeHint());
-}
-
-void MediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate)
-{
- Q_UNUSED(oldstate);
-
- emit this->MediaStateChanged(newstate);
-
- if (oldstate == Phonon::LoadingState) {
- QRect videoHintRect = QRect(QPoint(0, 0), m_videoWindow.sizeHint());
- QRect newVideoRect = QApplication::desktop()->screenGeometry().intersected(videoHintRect);
- if (!m_smallScreen) {
- if (m_MediaObject.hasVideo()) {
- // Flush event que so that sizeHint takes the
- // recently shown/hidden m_videoWindow into account:
- qApp->processEvents();
- resize(sizeHint());
- } else
- resize(minimumSize());
- }
- }
-
- switch (newstate) {
- case Phonon::ErrorState:
- if (m_MediaObject.errorType() == Phonon::FatalError) {
- playButton->setEnabled(false);
- rewindButton->setEnabled(false);
- } else {
- m_MediaObject.pause();
- }
- QMessageBox::warning(this, "Phonon Mediaplayer", m_MediaObject.errorString(), QMessageBox::Close);
- break;
-
- case Phonon::StoppedState:
- m_videoWidget->setFullScreen(false);
- // Fall through
- case Phonon::PausedState:
- playButton->setIcon(playIcon);
- if (m_MediaObject.currentSource().type() != Phonon::MediaSource::Invalid){
- playButton->setEnabled(true);
- rewindButton->setEnabled(true);
- } else {
- playButton->setEnabled(false);
- rewindButton->setEnabled(false);
- }
- break;
- case Phonon::PlayingState:
- playButton->setEnabled(true);
- playButton->setIcon(pauseIcon);
- if (m_MediaObject.hasVideo())
- m_videoWindow.show();
- // Fall through
- case Phonon::BufferingState:
- rewindButton->setEnabled(true);
- break;
- case Phonon::LoadingState:
- rewindButton->setEnabled(false);
- break;
- }
-
-}
-
-void MediaPlayer::initSettingsDialog()
-{
- settingsDialog = new QDialog(this);
- ui = new Ui_settings();
- ui->setupUi(settingsDialog);
-
- connect(ui->brightnessSlider, SIGNAL(valueChanged(int)), this, SLOT(setBrightness(int)));
- connect(ui->hueSlider, SIGNAL(valueChanged(int)), this, SLOT(setHue(int)));
- connect(ui->saturationSlider, SIGNAL(valueChanged(int)), this, SLOT(setSaturation(int)));
- connect(ui->contrastSlider , SIGNAL(valueChanged(int)), this, SLOT(setContrast(int)));
- connect(ui->aspectCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setAspect(int)));
- connect(ui->scalemodeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setScale(int)));
-
- ui->brightnessSlider->setValue(int(m_videoWidget->brightness() * SLIDER_RANGE));
- ui->hueSlider->setValue(int(m_videoWidget->hue() * SLIDER_RANGE));
- ui->saturationSlider->setValue(int(m_videoWidget->saturation() * SLIDER_RANGE));
- ui->contrastSlider->setValue(int(m_videoWidget->contrast() * SLIDER_RANGE));
- ui->aspectCombo->setCurrentIndex(m_videoWidget->aspectRatio());
- ui->scalemodeCombo->setCurrentIndex(m_videoWidget->scaleMode());
- connect(ui->effectButton, SIGNAL(clicked()), this, SLOT(configureEffect()));
-
-#ifdef Q_WS_X11
- //Cross fading is not currently implemented in the GStreamer backend
- ui->crossFadeSlider->setVisible(false);
- ui->crossFadeLabel->setVisible(false);
- ui->crossFadeLabel1->setVisible(false);
- ui->crossFadeLabel2->setVisible(false);
- ui->crossFadeLabel3->setVisible(false);
-#endif
- ui->crossFadeSlider->setValue((int)(2 * m_MediaObject.transitionTime() / 1000.0f));
-
- // Insert audio devices:
- QList<Phonon::AudioOutputDevice> devices = Phonon::BackendCapabilities::availableAudioOutputDevices();
- for (int i=0; i<devices.size(); i++){
- QString itemText = devices[i].name();
- if (!devices[i].description().isEmpty()) {
- itemText += QString::fromLatin1(" (%1)").arg(devices[i].description());
- }
- ui->deviceCombo->addItem(itemText);
- if (devices[i] == m_AudioOutput.outputDevice())
- ui->deviceCombo->setCurrentIndex(i);
- }
-
- // Insert audio effects:
- ui->audioEffectsCombo->addItem(tr("<no effect>"));
- QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
- Phonon::Effect *currEffect = currEffects.size() ? currEffects[0] : 0;
- QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
- for (int i=0; i<availableEffects.size(); i++){
- ui->audioEffectsCombo->addItem(availableEffects[i].name());
- if (currEffect && availableEffects[i] == currEffect->description())
- ui->audioEffectsCombo->setCurrentIndex(i+1);
- }
- connect(ui->audioEffectsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(effectChanged()));
-
-}
-
-void MediaPlayer::setVolume(qreal volume)
-{
- m_AudioOutput.setVolume(volume);
-}
-
-void MediaPlayer::setSmallScreen(bool smallScreen)
-{
- m_smallScreen = smallScreen;
-}
-
-void MediaPlayer::effectChanged()
-{
- int currentIndex = ui->audioEffectsCombo->currentIndex();
- if (currentIndex) {
- QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
- Phonon::EffectDescription chosenEffect = availableEffects[currentIndex - 1];
-
- QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
- Phonon::Effect *currentEffect = currEffects.size() ? currEffects[0] : 0;
-
- // Deleting the running effect will stop playback, it is deleted when removed from path
- if (nextEffect && !(currentEffect && (currentEffect->description().name() == nextEffect->description().name())))
- delete nextEffect;
-
- nextEffect = new Phonon::Effect(chosenEffect);
- }
- ui->effectButton->setEnabled(currentIndex);
-}
-
-void MediaPlayer::showSettingsDialog()
-{
- const bool hasPausedForDialog = playPauseForDialog();
-
- if (!settingsDialog)
- initSettingsDialog();
-
- float oldBrightness = m_videoWidget->brightness();
- float oldHue = m_videoWidget->hue();
- float oldSaturation = m_videoWidget->saturation();
- float oldContrast = m_videoWidget->contrast();
- Phonon::VideoWidget::AspectRatio oldAspect = m_videoWidget->aspectRatio();
- Phonon::VideoWidget::ScaleMode oldScale = m_videoWidget->scaleMode();
- int currentEffect = ui->audioEffectsCombo->currentIndex();
- settingsDialog->exec();
-
- if (settingsDialog->result() == QDialog::Accepted){
- m_MediaObject.setTransitionTime((int)(1000 * float(ui->crossFadeSlider->value()) / 2.0f));
- QList<Phonon::AudioOutputDevice> devices = Phonon::BackendCapabilities::availableAudioOutputDevices();
- m_AudioOutput.setOutputDevice(devices[ui->deviceCombo->currentIndex()]);
- QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
- QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
-
- if (ui->audioEffectsCombo->currentIndex() > 0){
- Phonon::Effect *currentEffect = currEffects.size() ? currEffects[0] : 0;
- if (!currentEffect || currentEffect->description() != nextEffect->description()){
- foreach(Phonon::Effect *effect, currEffects) {
- m_audioOutputPath.removeEffect(effect);
- delete effect;
- }
- m_audioOutputPath.insertEffect(nextEffect);
- }
- } else {
- foreach(Phonon::Effect *effect, currEffects) {
- m_audioOutputPath.removeEffect(effect);
- delete effect;
- nextEffect = 0;
- }
- }
- } else {
- // Restore previous settings
- m_videoWidget->setBrightness(oldBrightness);
- m_videoWidget->setSaturation(oldSaturation);
- m_videoWidget->setHue(oldHue);
- m_videoWidget->setContrast(oldContrast);
- m_videoWidget->setAspectRatio(oldAspect);
- m_videoWidget->setScaleMode(oldScale);
- ui->audioEffectsCombo->setCurrentIndex(currentEffect);
- }
-
- if (hasPausedForDialog)
- m_MediaObject.play();
-}
-
-void MediaPlayer::initVideoWindow()
-{
- QVBoxLayout *videoLayout = new QVBoxLayout();
- videoLayout->addWidget(m_videoWidget);
- videoLayout->setContentsMargins(0, 0, 0, 0);
- m_videoWindow.setLayout(videoLayout);
- m_videoWindow.setMinimumSize(100, 100);
-}
-
-
-void MediaPlayer::configureEffect()
-{
- if (!nextEffect)
- return;
-
-
- QList<Phonon::Effect *> currEffects = m_audioOutputPath.effects();
- const QList<Phonon::EffectDescription> availableEffects = Phonon::BackendCapabilities::availableAudioEffects();
- if (ui->audioEffectsCombo->currentIndex() > 0) {
- Phonon::EffectDescription chosenEffect = availableEffects[ui->audioEffectsCombo->currentIndex() - 1];
-
- QDialog effectDialog;
- effectDialog.setWindowTitle(tr("Configure effect"));
- QVBoxLayout *topLayout = new QVBoxLayout(&effectDialog);
-
- QLabel *description = new QLabel("<b>Description:</b><br>" + chosenEffect.description(), &effectDialog);
- description->setWordWrap(true);
- topLayout->addWidget(description);
-
- QScrollArea *scrollArea = new QScrollArea(&effectDialog);
- topLayout->addWidget(scrollArea);
-
- QVariantList savedParamValues;
- foreach(Phonon::EffectParameter param, nextEffect->parameters()) {
- savedParamValues << nextEffect->parameterValue(param);
- }
-
- QWidget *scrollWidget = new Phonon::EffectWidget(nextEffect);
- scrollWidget->setMinimumWidth(320);
- scrollWidget->setContentsMargins(10, 10, 10,10);
- scrollArea->setWidget(scrollWidget);
-
- QDialogButtonBox *bbox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, &effectDialog);
- connect(bbox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), &effectDialog, SLOT(accept()));
- connect(bbox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), &effectDialog, SLOT(reject()));
- topLayout->addWidget(bbox);
-
- effectDialog.exec();
-
- if (effectDialog.result() != QDialog::Accepted) {
- //we need to restore the parameters values
- int currentIndex = 0;
- foreach(Phonon::EffectParameter param, nextEffect->parameters()) {
- nextEffect->setParameterValue(param, savedParamValues.at(currentIndex++));
- }
-
- }
- }
-}
-
-void MediaPlayer::handleDrop(QDropEvent *e)
-{
- QList<QUrl> urls = e->mimeData()->urls();
- if (e->proposedAction() == Qt::MoveAction){
- // Just add to the queue:
- for (int i=0; i<urls.size(); i++)
- m_MediaObject.enqueue(Phonon::MediaSource(urls[i].toLocalFile()));
- } else {
- // Create new queue:
- m_MediaObject.clearQueue();
- if (urls.size() > 0) {
- QString fileName = urls[0].toLocalFile();
- QDir dir(fileName);
- if (dir.exists()) {
- dir.setFilter(QDir::Files);
- QStringList entries = dir.entryList();
- if (entries.size() > 0) {
- setFile(fileName + QDir::separator() + entries[0]);
- for (int i=1; i< entries.size(); ++i)
- m_MediaObject.enqueue(fileName + QDir::separator() + entries[i]);
- }
- } else {
- setFile(fileName);
- for (int i=1; i<urls.size(); i++)
- m_MediaObject.enqueue(Phonon::MediaSource(urls[i].toLocalFile()));
- }
- }
- }
- forwardButton->setEnabled(m_MediaObject.queue().size() > 0);
- m_MediaObject.play();
-}
-
-void MediaPlayer::dropEvent(QDropEvent *e)
-{
- if (e->mimeData()->hasUrls() && e->proposedAction() != Qt::LinkAction) {
- e->acceptProposedAction();
- handleDrop(e);
- } else {
- e->ignore();
- }
-}
-
-void MediaPlayer::dragEnterEvent(QDragEnterEvent *e)
-{
- dragMoveEvent(e);
-}
-
-void MediaPlayer::dragMoveEvent(QDragMoveEvent *e)
-{
- if (e->mimeData()->hasUrls()) {
- if (e->proposedAction() == Qt::CopyAction || e->proposedAction() == Qt::MoveAction){
- e->acceptProposedAction();
- }
- }
-}
-
-void MediaPlayer::play()
-{
- m_MediaObject.play();
-}
-
-void MediaPlayer::stop()
-{
- m_MediaObject.pause();
-}
-
-void MediaPlayer::setFile(const QString &fileName)
-{
- //setWindowTitle(fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1));
- m_MediaObject.setCurrentSource(Phonon::MediaSource(fileName));
-}
-
-void MediaPlayer::setLocation(const QString& location)
-{
- //setWindowTitle(location.right(location.length() - location.lastIndexOf('/') - 1));
- m_MediaObject.setCurrentSource(Phonon::MediaSource(QUrl::fromEncoded(location.toUtf8())));
- //m_MediaObject.play();
-}
-
-bool MediaPlayer::playPauseForDialog()
-{
- // If we're running on a small screen, we want to pause the video when
- // popping up dialogs. We neither want to tamper with the state if the
- // user has paused.
- if (m_smallScreen && m_MediaObject.hasVideo()) {
- if (Phonon::PlayingState == m_MediaObject.state()) {
- m_MediaObject.pause();
- return true;
- }
- }
- return false;
-}
-
-void MediaPlayer::openFile()
-{
- const bool hasPausedForDialog = playPauseForDialog();
-
- QStringList fileNames = QFileDialog::getOpenFileNames(this, QString(),
- QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
-
- if (hasPausedForDialog)
- m_MediaObject.play();
-
- m_MediaObject.clearQueue();
- if (fileNames.size() > 0) {
- QString fileName = fileNames[0];
- setFile(fileName);
- for (int i=1; i<fileNames.size(); i++)
- m_MediaObject.enqueue(Phonon::MediaSource(fileNames[i]));
- }
- forwardButton->setEnabled(m_MediaObject.queue().size() > 0);
-}
-
-void MediaPlayer::bufferStatus(int percent)
-{
- if (percent == 100)
- progressLabel->setText(QString());
- else {
- QString str = QString::fromLatin1("(%1%)").arg(percent);
- progressLabel->setText(str);
- }
-}
-
-void MediaPlayer::setSaturation(int val)
-{
- m_videoWidget->setSaturation(val / qreal(SLIDER_RANGE));
-}
-
-void MediaPlayer::setHue(int val)
-{
- m_videoWidget->setHue(val / qreal(SLIDER_RANGE));
-}
-
-void MediaPlayer::setAspect(int val)
-{
- m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatio(val));
-}
-
-void MediaPlayer::setScale(int val)
-{
- m_videoWidget->setScaleMode(Phonon::VideoWidget::ScaleMode(val));
-}
-
-void MediaPlayer::setBrightness(int val)
-{
- m_videoWidget->setBrightness(val / qreal(SLIDER_RANGE));
-}
-
-void MediaPlayer::setContrast(int val)
-{
- m_videoWidget->setContrast(val / qreal(SLIDER_RANGE));
-}
-
-void MediaPlayer::updateInfo()
-{
- int maxLength = 30;
- QString font = "<font color=#ffeeaa>";
- QString fontmono = "<font family=\"monospace,courier new\" color=#ffeeaa>";
-
- QMap <QString, QString> metaData = m_MediaObject.metaData();
- QString trackArtist = metaData.value("ARTIST");
- if (trackArtist.length() > maxLength)
- trackArtist = trackArtist.left(maxLength) + "...";
-
- QString trackTitle = metaData.value("TITLE");
- int trackBitrate = metaData.value("BITRATE").toInt();
-
- QString fileName;
- if (m_MediaObject.currentSource().type() == Phonon::MediaSource::Url) {
- fileName = m_MediaObject.currentSource().url().toString();
- } else {
- fileName = m_MediaObject.currentSource().fileName();
- fileName = fileName.right(fileName.length() - fileName.lastIndexOf('/') - 1);
- if (fileName.length() > maxLength)
- fileName = fileName.left(maxLength) + "...";
- }
-
- QString title;
- if (!trackTitle.isEmpty()) {
- if (trackTitle.length() > maxLength)
- trackTitle = trackTitle.left(maxLength) + "...";
- title = "Title: " + font + trackTitle + "<br></font>";
- } else if (!fileName.isEmpty()) {
- if (fileName.length() > maxLength)
- fileName = fileName.left(maxLength) + "...";
- title = font + fileName + "</font>";
- if (m_MediaObject.currentSource().type() == Phonon::MediaSource::Url) {
- title.prepend("Url: ");
- } else {
- title.prepend("File: ");
- }
- }
-
- QString artist;
- if (!trackArtist.isEmpty())
- artist = "Artist: " + font + trackArtist + "</font>";
-
- QString bitrate;
- if (trackBitrate != 0)
- bitrate = "<br>Bitrate: " + font + QString::number(trackBitrate/1000) + "kbit</font>";
-
- info->setText(title + artist + bitrate);
-}
-
-void MediaPlayer::updateTime()
-{
- long len = m_MediaObject.totalTime();
- long pos = m_MediaObject.currentTime();
- QString timeString;
- if (pos || len)
- {
- int sec = pos/1000;
- int min = sec/60;
- int hour = min/60;
- int msec = pos;
-
- QTime playTime(hour%60, min%60, sec%60, msec%1000);
- sec = len / 1000;
- min = sec / 60;
- hour = min / 60;
- msec = len;
-
- QTime stopTime(hour%60, min%60, sec%60, msec%1000);
- QString timeFormat = "m:ss";
- if (hour > 0)
- timeFormat = "h:mm:ss";
- timeString = playTime.toString(timeFormat);
- if (len)
- timeString += " / " + stopTime.toString(timeFormat);
- }
- timeLabel->setText(timeString);
-}
-
-void MediaPlayer::rewind()
-{
- m_MediaObject.seek(0);
-}
-
-void MediaPlayer::forward()
-{
- QList<Phonon::MediaSource> queue = m_MediaObject.queue();
- if (queue.size() > 0) {
- m_MediaObject.setCurrentSource(queue[0]);
- forwardButton->setEnabled(queue.size() > 1);
- m_MediaObject.play();
- }
-}
-
-void MediaPlayer::openUrl()
-{
- QSettings settings;
- settings.beginGroup(QLatin1String("BrowserMainWindow"));
- QString sourceURL = settings.value("location").toString();
- bool ok = false;
- sourceURL = QInputDialog::getText(this, tr("Open Location"), tr("Please enter a valid address here:"), QLineEdit::Normal, sourceURL, &ok);
- if (ok && !sourceURL.isEmpty()) {
- setLocation(sourceURL);
- settings.setValue("location", sourceURL);
- }
-}
-
-/*!
- \since 4.6
- */
-void MediaPlayer::openRamFile()
-{
- QSettings settings;
- settings.beginGroup(QLatin1String("BrowserMainWindow"));
-
- const QStringList fileNameList(QFileDialog::getOpenFileNames(this,
- QString(),
- settings.value("openRamFile").toString(),
- QLatin1String("RAM files (*.ram)")));
-
- if (fileNameList.isEmpty())
- return;
-
- QFile linkFile;
- QList<QUrl> list;
- QByteArray sourceURL;
- for (int i = 0; i < fileNameList.count(); i++ ) {
- linkFile.setFileName(fileNameList[i]);
- if (linkFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- while (!linkFile.atEnd()) {
- sourceURL = linkFile.readLine().trimmed();
- if (!sourceURL.isEmpty()) {
- const QUrl url(QUrl::fromEncoded(sourceURL));
- if (url.isValid())
- list.append(url);
- }
- }
- linkFile.close();
- }
- }
-
- if (!list.isEmpty()) {
- m_MediaObject.clearQueue();
- setLocation(list[0].toString());
- for (int i = 1; i < list.count(); i++)
- m_MediaObject.enqueue(Phonon::MediaSource(list[i]));
- m_MediaObject.play();
- }
-
- forwardButton->setEnabled(!m_MediaObject.queue().isEmpty());
- settings.setValue("openRamFile", fileNameList[0]);
-}
-
-void MediaPlayer::finished()
-{
-}
-
-void MediaPlayer::showContextMenu(const QPoint &p)
-{
- fileMenu->popup(m_videoWidget->isFullScreen() ? p : mapToGlobal(p));
-}
-
-void MediaPlayer::scaleChanged(QAction *act)
-{
- if (act->text() == tr("Scale and crop"))
- m_videoWidget->setScaleMode(Phonon::VideoWidget::ScaleAndCrop);
- else
- m_videoWidget->setScaleMode(Phonon::VideoWidget::FitInView);
-}
-
-void MediaPlayer::aspectChanged(QAction *act)
-{
- if (act->text() == tr("16/9"))
- m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatio16_9);
- else if (act->text() == tr("Scale"))
- m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatioWidget);
- else if (act->text() == tr("4/3"))
- m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatio4_3);
- else
- m_videoWidget->setAspectRatio(Phonon::VideoWidget::AspectRatioAuto);
-}
-
-void MediaPlayer::hasVideoChanged(bool bHasVideo)
-{
- info->setVisible(!bHasVideo);
- m_videoWindow.setVisible(bHasVideo);
- m_fullScreenAction->setEnabled(bHasVideo);
-}
-
-#ifdef Q_OS_SYMBIAN
-void MediaPlayer::selectIAP()
-{
- TRAPD(err, selectIAPL());
- if (KErrNone != err)
- QMessageBox::warning(this, "Phonon Mediaplayer", "Error selecting IAP", QMessageBox::Close);
-}
-
-void MediaPlayer::selectIAPL()
-{
- QVariant currentIAPValue = m_MediaObject.property("InternetAccessPointName");
- QString currentIAPString = currentIAPValue.toString();
- bool ok = false;
- CCommsDatabase *commsDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
- CleanupStack::PushL(commsDb);
- commsDb->ShowHiddenRecords();
- CCommsDbTableView* view = commsDb->OpenTableLC(TPtrC(IAP));
- QStringList items;
- TInt currentIAP = 0;
- for (TInt l = view->GotoFirstRecord(), i = 0; l != KErrNotFound; l = view->GotoNextRecord(), i++) {
- TBuf<KCommsDbSvrMaxColumnNameLength> iapName;
- view->ReadTextL(TPtrC(COMMDB_NAME), iapName);
- QString iapString = QString::fromUtf16(iapName.Ptr(), iapName.Length());
- items << iapString;
- if (iapString == currentIAPString)
- currentIAP = i;
- }
- currentIAPString = QInputDialog::getItem(this, tr("Select Access Point"), tr("Select Access Point"), items, currentIAP, false, &ok);
- if (ok)
- m_MediaObject.setProperty("InternetAccessPointName", currentIAPString);
- CleanupStack::PopAndDestroy(2); //commsDB, view
-}
-#endif
diff --git a/exampleCode/player/mediaplayer.h b/exampleCode/player/mediaplayer.h
deleted file mode 100644
index 8dd0602..0000000
--- a/exampleCode/player/mediaplayer.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** GNU General Public License Usage
-** This file is licensed under GPL v2.
-**
-**
-** $QT_END_LICENSE$
-**
-***************************************************************************/
-
-#ifndef MEDIALAYER_H
-#define MEDIAPLAYER_H
-
-#include <QtGui/QWidget>
-#include <QtGui/QApplication>
-#include <QtCore/QTimerEvent>
-#include <QtGui/QShowEvent>
-#include <QtGui/QIcon>
-#include <QtCore/QBasicTimer>
-#include <QtGui/QAction>
-
-#include <phonon/audiooutput.h>
-#include <phonon/backendcapabilities.h>
-#include <phonon/effect.h>
-#include <phonon/effectparameter.h>
-#include <phonon/effectwidget.h>
-#include <phonon/mediaobject.h>
-#include <phonon/seekslider.h>
-#include <phonon/videowidget.h>
-#include <phonon/volumeslider.h>
-
-QT_BEGIN_NAMESPACE
-class QPushButton;
-class QLabel;
-class QSlider;
-class QTextEdit;
-class QMenu;
-class Ui_settings;
-QT_END_NAMESPACE
-
-class MediaPlayer;
-
-class MediaVideoWidget : public Phonon::VideoWidget
-{
- Q_OBJECT
-
-public:
- MediaVideoWidget(MediaPlayer *player, QWidget *parent = 0);
-
-public slots:
- // Over-riding non-virtual Phonon::VideoWidget slot
- void setFullScreen(bool);
-
-signals:
- void fullScreenChanged(bool);
-
-protected:
- void mouseDoubleClickEvent(QMouseEvent *e);
- void keyPressEvent(QKeyEvent *e);
- bool event(QEvent *e);
- void timerEvent(QTimerEvent *e);
- void dropEvent(QDropEvent *e);
- void dragEnterEvent(QDragEnterEvent *e);
-
-private:
- MediaPlayer *m_player;
- QBasicTimer m_timer;
- QAction m_action;
-};
-
-class MediaPlayer :
- public QWidget
-{
- Q_OBJECT
-public:
- MediaPlayer(QString AppName);
-
- void dragEnterEvent(QDragEnterEvent *e);
- void dragMoveEvent(QDragMoveEvent *e);
- void dropEvent(QDropEvent *e);
- void handleDrop(QDropEvent *e);
- void setFile(const QString &text);
- void setLocation(const QString &location);
- void initVideoWindow();
- void initSettingsDialog();
- void setVolume(qreal volume);
- void setSmallScreen(bool smallScreen);
-
- QPushButton *playButton;
-
-signals:
- void MediaStateChanged(Phonon::State newstate);
-public slots:
- void openFile();
- void rewind();
- void forward();
- void updateInfo();
- void updateTime();
- void finished();
- void play();
- void stop();
- void scaleChanged(QAction *);
- void aspectChanged(QAction *);
-
-private slots:
- void setAspect(int);
- void setScale(int);
- void setSaturation(int);
- void setContrast(int);
- void setHue(int);
- void setBrightness(int);
- void stateChanged(Phonon::State newstate, Phonon::State oldstate);
- void effectChanged();
- void showSettingsDialog();
- void showContextMenu(const QPoint& point);
- void bufferStatus(int percent);
- void openUrl();
-#ifdef Q_OS_SYMBIAN
- void selectIAP();
-#endif
- void openRamFile();
- void configureEffect();
- void hasVideoChanged(bool);
-
-private:
- bool playPauseForDialog();
-#ifdef Q_OS_SYMBIAN
- void selectIAPL();
-#endif
-
- QIcon playIcon;
- QIcon pauseIcon;
- QMenu *fileMenu;
- QPushButton *rewindButton;
- QPushButton *forwardButton;
- Phonon::SeekSlider *slider;
- QLabel *timeLabel;
- QLabel *progressLabel;
- Phonon::VolumeSlider *volume;
- QSlider *m_hueSlider;
- QSlider *m_satSlider;
- QSlider *m_contSlider;
- QLabel *info;
- Phonon::Effect *nextEffect;
- QDialog *settingsDialog;
- Ui_settings *ui;
- QAction *m_fullScreenAction;
-
- QWidget m_videoWindow;
- Phonon::MediaObject m_MediaObject;
- Phonon::AudioOutput m_AudioOutput;
- MediaVideoWidget *m_videoWidget;
- Phonon::Path m_audioOutputPath;
- bool m_smallScreen;
-};
-
-#endif //MEDIAPLAYER_H
diff --git a/exampleCode/player/mediaplayer.qrc b/exampleCode/player/mediaplayer.qrc
deleted file mode 100644
index bcdf404..0000000
--- a/exampleCode/player/mediaplayer.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
- <file>images/screen.png</file>
-</qresource>
-</RCC>
diff --git a/exampleCode/player/player.pro b/exampleCode/player/player.pro
deleted file mode 100755
index 7feffba..0000000
--- a/exampleCode/player/player.pro
+++ /dev/null
@@ -1,53 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Thu Aug 23 18:02:14 2007
-######################################################################
-
-TEMPLATE = app
-DEPENDPATH += . build src ui
-
-QT += phonon
-
-FORMS += settings.ui
-RESOURCES += mediaplayer.qrc
-
-!win32:CONFIG += CONSOLE
-
-SOURCES += main.cpp mediaplayer.cpp \
- audiomanagerinteractor.cpp \
- dbushandler.cpp
-HEADERS += mediaplayer.h \
- audiomanagerinteractor.h \
- dbushandler.h \
- audiomanagertypes.h
-
-target.path = $$[QT_INSTALL_DEMOS]/qmediaplayer
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images
-sources.path = $$[QT_INSTALL_DEMOS]/qmediaplayer
-INSTALLS += target sources
-
-wince*{
-DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout
-}
-
-symbian {
- TARGET.UID3 = 0xA000C613
-
- addFiles.sources = ../embedded/desktopservices/data/sax.mp3
- addFiles.path = /data/sounds/
- DEPLOYMENT += addFiles
-
- include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
-
- LIBS += -lcommdb
-
- TARGET.CAPABILITY="NetworkServices"
-}
-
-
-unix {
- CONFIG += link_pkgconfig
- PKGCONFIG += glib-2.0
- PKGCONFIG += dbus-1
- PKGCONFIG += dbus-glib-1
-
-}
diff --git a/exampleCode/player/player.pro.user b/exampleCode/player/player.pro.user
deleted file mode 100755
index 5ce0d49..0000000
--- a/exampleCode/player/player.pro.user
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2012-07-04T14:56:51. -->
-<qtcreator>
- <data>
- <variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">0</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.EditorSettings</variable>
- <valuemap type="QVariantMap">
- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
- <value type="QString" key="language">Cpp</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QString" key="CurrentPreferences">CppGlobal</value>
- </valuemap>
- </valuemap>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
- <value type="QString" key="language">QmlJS</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
- </valuemap>
- </valuemap>
- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">System</value>
- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
- <value type="int" key="EditorConfiguration.IndentSize">4</value>
- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
- <value type="int" key="EditorConfiguration.TabSize">8</value>
- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap"/>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">3</value>
- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 4.8.1 for GCC (Qt SDK) Release</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/christian/workspace/player-build-desktop-Desktop_Qt_4_8_1_for_GCC__Qt_SDK__Release</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
- <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 4.8.1 for GCC (Qt SDK) Debug</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/christian/workspace/player-build-desktop-Desktop_Qt_4_8_1_for_GCC__Qt_SDK__Debug</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
- <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
- <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.1 (System) Release</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/christian/workspace/player-build-desktop-Qt_4_8_1__System__Release</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
- <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
- <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 4.8.1 for GCC (Qt SDK) Debug2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/christian/workspace/player-build-desktop-Qt_4_8_1__System__Debug</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">5</value>
- <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">4</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">No deployment</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
- <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
- <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">player</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value>
- <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments">player alsa_output.default</value>
- <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">player.pro</value>
- <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
- <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.TargetCount</variable>
- <value type="int">1</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
- <value type="QString">{ff8ada78-76cc-4ca1-bc41-e44127bd6bd0}</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
- <value type="int">10</value>
- </data>
-</qtcreator>
diff --git a/exampleCode/player/settings.ui b/exampleCode/player/settings.ui
deleted file mode 100644
index 03bd70e..0000000
--- a/exampleCode/player/settings.ui
+++ /dev/null
@@ -1,495 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>settings</class>
- <widget class="QDialog" name="settings">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>175</width>
- <height>397</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Settings</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Video options:</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="5" column="2">
- <widget class="QComboBox" name="scalemodeCombo">
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
- </property>
- <item>
- <property name="text">
- <string>Fit in view</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Scale and crop</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_9">
- <property name="text">
- <string>Contrast:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2">
- <widget class="QSlider" name="contrastSlider">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="minimum">
- <number>-8</number>
- </property>
- <property name="maximum">
- <number>8</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="tickPosition">
- <enum>QSlider::TicksBelow</enum>
- </property>
- <property name="tickInterval">
- <number>4</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Brightness:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QSlider" name="brightnessSlider">
- <property name="minimum">
- <number>-8</number>
- </property>
- <property name="maximum">
- <number>8</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="tickPosition">
- <enum>QSlider::TicksBelow</enum>
- </property>
- <property name="tickInterval">
- <number>4</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Saturation:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" colspan="2">
- <widget class="QSlider" name="saturationSlider">
- <property name="minimum">
- <number>-8</number>
- </property>
- <property name="maximum">
- <number>8</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="tickPosition">
- <enum>QSlider::TicksBelow</enum>
- </property>
- <property name="tickInterval">
- <number>4</number>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Hue:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1" colspan="2">
- <widget class="QSlider" name="hueSlider">
- <property name="minimum">
- <number>-8</number>
- </property>
- <property name="maximum">
- <number>8</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="tickPosition">
- <enum>QSlider::TicksBelow</enum>
- </property>
- <property name="tickInterval">
- <number>4</number>
- </property>
- </widget>
- </item>
- <item row="4" column="0" colspan="2">
- <widget class="QLabel" name="label_10">
- <property name="text">
- <string>Aspect ratio:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="2">
- <widget class="QComboBox" name="aspectCombo">
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
- </property>
- <item>
- <property name="text">
- <string>Auto</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Stretch</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>4/3</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>16/9</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="5" column="0" colspan="2">
- <widget class="QLabel" name="label_11">
- <property name="text">
- <string>Scale Mode:</string>
- </property>
- </widget>
- </item>
- </layout>
- <zorder>scalemodeCombo</zorder>
- <zorder>label_9</zorder>
- <zorder>contrastSlider</zorder>
- <zorder>label_8</zorder>
- <zorder>brightnessSlider</zorder>
- <zorder>label_7</zorder>
- <zorder>saturationSlider</zorder>
- <zorder>label_2</zorder>
- <zorder>hueSlider</zorder>
- <zorder>label_10</zorder>
- <zorder>aspectCombo</zorder>
- <zorder>label_11</zorder>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Audio options:</string>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>10</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>Audio device:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="deviceCombo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>10</width>
- <height>0</height>
- </size>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label_6">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>10</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>Audio effect:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="audioEffectsCombo">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>10</width>
- <height>0</height>
- </size>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToMinimumContentsLength</enum>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="effectButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Setup</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout">
- <item>
- <widget class="QLabel" name="crossFadeLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>10</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>Cross fade:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout">
- <item>
- <widget class="QSlider" name="crossFadeSlider">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimum">
- <number>-20</number>
- </property>
- <property name="maximum">
- <number>20</number>
- </property>
- <property name="singleStep">
- <number>1</number>
- </property>
- <property name="pageStep">
- <number>2</number>
- </property>
- <property name="value">
- <number>0</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="tickPosition">
- <enum>QSlider::TicksBelow</enum>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout">
- <item>
- <widget class="QLabel" name="crossFadeLabel1">
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
- </property>
- <property name="text">
- <string>-10 Sec</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="crossFadeLabel2">
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
- </property>
- <property name="text">
- <string>0</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="crossFadeLabel3">
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- </font>
- </property>
- <property name="text">
- <string>10 Sec </string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections>
- <connection>
- <sender>buttonBox</sender>
- <signal>accepted()</signal>
- <receiver>settings</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
- </hint>
- <hint type="destinationlabel">
- <x>157</x>
- <y>274</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>buttonBox</sender>
- <signal>rejected()</signal>
- <receiver>settings</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
- </hint>
- <hint type="destinationlabel">
- <x>286</x>
- <y>274</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff --git a/src-gen/org/genivi/NodeStateManager/Consumer.h b/src-gen/org/genivi/NodeStateManager/Consumer.h
deleted file mode 100644
index 026f431..0000000
--- a/src-gen/org/genivi/NodeStateManager/Consumer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Consumer_H_
-
-
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/types.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-class Consumer {
- public:
- virtual ~Consumer() { }
-
- static inline const char* getInterfaceId();
- static inline CommonAPI::Version getInterfaceVersion();
-};
-
-const char* Consumer::getInterfaceId() {
- return "org.genivi.NodeStateManager.Consumer";
-}
-
-CommonAPI::Version Consumer::getInterfaceVersion() {
- return CommonAPI::Version(1, 0);
-}
-
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-namespace CommonAPI {
-
-}
-
-
-namespace std {
- //hashes for types
-
- //hashes for error types
-}
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_H_
diff --git a/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp b/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
deleted file mode 100644
index 202680d..0000000
--- a/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#include "ConsumerDBusProxy.h"
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createConsumerDBusProxy(
- const std::string& commonApiAddress,
- const std::string& interfaceName,
- const std::string& busName,
- const std::string& objectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection) {
- return std::make_shared<ConsumerDBusProxy>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection);
-}
-
-__attribute__((constructor)) void registerConsumerDBusProxy(void) {
- CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(Consumer::getInterfaceId(),
- &createConsumerDBusProxy);
-}
-
-ConsumerDBusProxy::ConsumerDBusProxy(
- const std::string& commonApiAddress,
- const std::string& interfaceName,
- const std::string& busName,
- const std::string& objectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& 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")
-, nodeApplicationMode_(*this, "NodeApplicationMode", "i"),
- sessionStateChanged_(*this, "SessionStateChanged", "sii"),
- nodeState_(*this, "NodeState", "i")
- {
-}
-
-ConsumerDBusProxy::BootModeAttribute& ConsumerDBusProxy::getBootModeAttribute() {
- return bootMode_;
-}
-ConsumerDBusProxy::RestartReasonAttribute& ConsumerDBusProxy::getRestartReasonAttribute() {
- return restartReason_;
-}
-ConsumerDBusProxy::ShutdownReasonAttribute& ConsumerDBusProxy::getShutdownReasonAttribute() {
- return shutdownReason_;
-}
-ConsumerDBusProxy::WakeUpReasonAttribute& ConsumerDBusProxy::getWakeUpReasonAttribute() {
- return wakeUpReason_;
-}
-
-ConsumerDBusProxy::NodeApplicationModeEvent& ConsumerDBusProxy::getNodeApplicationModeEvent() {
- return nodeApplicationMode_;
-}
-ConsumerDBusProxy::SessionStateChangedEvent& ConsumerDBusProxy::getSessionStateChangedEvent() {
- return sessionStateChanged_;
-}
-ConsumerDBusProxy::NodeStateEvent& ConsumerDBusProxy::getNodeStateEvent() {
- return nodeState_;
-}
-
-void ConsumerDBusProxy::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
- *this,
- "GetAppHealthCount",
- "",
- callStatus
- , Count);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
- *this,
- "GetAppHealthCount",
- "",
- std::move(callback));
-}
-void ConsumerDBusProxy::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
- *this,
- "LifecycleRequestComplete",
- "ui",
- RequestId, Status,
- callStatus
- , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
- *this,
- "LifecycleRequestComplete",
- "ui",
- RequestId, Status,
- std::move(callback));
-}
-void ConsumerDBusProxy::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
- *this,
- "GetInterfaceVersion",
- "",
- callStatus
- , Version);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
- *this,
- "GetInterfaceVersion",
- "",
- std::move(callback));
-}
-void ConsumerDBusProxy::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
- *this,
- "GetApplicationMode",
- "",
- callStatus
- , ErrorCode, ApplicationModeId);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
- *this,
- "GetApplicationMode",
- "",
- std::move(callback));
-}
-void ConsumerDBusProxy::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
- *this,
- "UnRegisterSession",
- "ssi",
- SessionName, SessionOwner, SeatID,
- callStatus
- , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
- *this,
- "UnRegisterSession",
- "ssi",
- SessionName, SessionOwner, SeatID,
- std::move(callback));
-}
-void ConsumerDBusProxy::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
- *this,
- "RegisterSession",
- "ssii",
- SessionName, SessionOwner, SeatID, SessionState,
- callStatus
- , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
- *this,
- "RegisterSession",
- "ssii",
- SessionName, SessionOwner, SeatID, SessionState,
- std::move(callback));
-}
-void ConsumerDBusProxy::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
- *this,
- "UnRegisterShutdownClient",
- "ssu",
- BusName, ObjName, ShutdownMode,
- callStatus
- , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
- *this,
- "UnRegisterShutdownClient",
- "ssu",
- BusName, ObjName, ShutdownMode,
- std::move(callback));
-}
-void ConsumerDBusProxy::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
- *this,
- "RegisterShutdownClient",
- "ssuu",
- BusName, ObjName, ShutdownMode, TimeoutMs,
- callStatus
- , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
- *this,
- "RegisterShutdownClient",
- "ssuu",
- BusName, ObjName, ShutdownMode, TimeoutMs,
- std::move(callback));
-}
-void ConsumerDBusProxy::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
- *this,
- "GetNodeState",
- "",
- callStatus
- , ErrorCode, NodeStateId);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
- *this,
- "GetNodeState",
- "",
- std::move(callback));
-}
-void ConsumerDBusProxy::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
- *this,
- "GetSessionState",
- "si",
- SessionName, SeatID,
- callStatus
- , SessionState, ErrorCode);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
- *this,
- "GetSessionState",
- "si",
- SessionName, SeatID,
- std::move(callback));
-}
-void ConsumerDBusProxy::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
- *this,
- "SetSessionState",
- "ssii",
- SessionName, SessionOwner, SessionState, SeatID,
- callStatus
- , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> ConsumerDBusProxy::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
- *this,
- "SetSessionState",
- "ssii",
- SessionName, SessionOwner, SessionState, SeatID,
- std::move(callback));
-}
-
-void ConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
- ownVersionMajor = 1;
- ownVersionMinor = 0;
-}
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
diff --git a/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h b/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
deleted file mode 100644
index fe17687..0000000
--- a/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_
-
-#include <org/genivi/NodeStateManager/ConsumerProxyBase.h>
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/DBus/DBusFactory.h>
-#include <CommonAPI/DBus/DBusProxy.h>
-#include <CommonAPI/DBus/DBusAttribute.h>
-#include <CommonAPI/DBus/DBusEvent.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-#include <string>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy {
- public:
- ConsumerDBusProxy(
- const std::string& commonApiAddress,
- const std::string& interfaceName,
- const std::string& busName,
- const std::string& objectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection);
-
- virtual ~ConsumerDBusProxy() { }
-
- virtual BootModeAttribute& getBootModeAttribute();
- virtual RestartReasonAttribute& getRestartReasonAttribute();
- virtual ShutdownReasonAttribute& getShutdownReasonAttribute();
- virtual WakeUpReasonAttribute& getWakeUpReasonAttribute();
-
- virtual NodeApplicationModeEvent& getNodeApplicationModeEvent();
- virtual SessionStateChangedEvent& getSessionStateChangedEvent();
- virtual NodeStateEvent& getNodeStateEvent();
-
-
- virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
- virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
-
- virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
-
- virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
- virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
-
- virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId);
- virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback);
-
- virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
-
- virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
-
- virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
-
- virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
-
- virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId);
- virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
-
- virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
-
- virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback);
-
- virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
-
- private:
- CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<BootModeAttribute> bootMode_;
- CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<RestartReasonAttribute> restartReason_;
- CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<ShutdownReasonAttribute> shutdownReason_;
- CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<WakeUpReasonAttribute> wakeUpReason_;
-
- CommonAPI::DBus::DBusEvent<NodeApplicationModeEvent> nodeApplicationMode_;
- CommonAPI::DBus::DBusEvent<SessionStateChangedEvent> sessionStateChanged_;
- CommonAPI::DBus::DBusEvent<NodeStateEvent> nodeState_;
-};
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_
diff --git a/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h b/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
deleted file mode 100644
index e0aab4d..0000000
--- a/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_
-
-#include "ConsumerProxyBase.h"
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/AttributeExtension.h>
-#include <CommonAPI/Factory.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-template <typename ... _AttributeExtensions>
-class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, public _AttributeExtensions... {
- public:
- ConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
- ~ConsumerProxy();
-
- /// Returns the wrapper class that provides access to the attribute BootMode.
- virtual BootModeAttribute& getBootModeAttribute() {
- return delegate_->getBootModeAttribute();
- }
-
- /// Returns the wrapper class that provides access to the attribute RestartReason.
- virtual RestartReasonAttribute& getRestartReasonAttribute() {
- return delegate_->getRestartReasonAttribute();
- }
-
- /// Returns the wrapper class that provides access to the attribute ShutdownReason.
- virtual ShutdownReasonAttribute& getShutdownReasonAttribute() {
- return delegate_->getShutdownReasonAttribute();
- }
-
- /// Returns the wrapper class that provides access to the attribute WakeUpReason.
- virtual WakeUpReasonAttribute& getWakeUpReasonAttribute() {
- return delegate_->getWakeUpReasonAttribute();
- }
-
-
- /// Returns the wrapper class that provides access to the broadcast NodeApplicationMode.
- virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() {
- return delegate_->getNodeApplicationModeEvent();
- }
-
- /// Returns the wrapper class that provides access to the broadcast SessionStateChanged.
- virtual SessionStateChangedEvent& getSessionStateChangedEvent() {
- return delegate_->getSessionStateChangedEvent();
- }
-
- /// Returns the wrapper class that provides access to the broadcast NodeState.
- virtual NodeStateEvent& getNodeStateEvent() {
- return delegate_->getNodeStateEvent();
- }
-
-
-
- /**
- * Calls GetAppHealthCount with synchronous semantics.
- *
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
- /**
- * Calls GetAppHealthCount with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
-
- /**
- * Calls LifecycleRequestComplete with synchronous semantics.
- *
- * All const parameters are input parameters to this method.
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- /**
- * Calls LifecycleRequestComplete with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
-
- /**
- * Calls GetInterfaceVersion with synchronous semantics.
- *
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
- /**
- * Calls GetInterfaceVersion with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
-
- /**
- * Calls GetApplicationMode with synchronous semantics.
- *
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId);
- /**
- * Calls GetApplicationMode with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback);
-
- /**
- * Calls UnRegisterSession with synchronous semantics.
- *
- * All const parameters are input parameters to this method.
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- /**
- * Calls UnRegisterSession with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
-
- /**
- * Calls RegisterSession with synchronous semantics.
- *
- * All const parameters are input parameters to this method.
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- /**
- * Calls RegisterSession with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
-
- /**
- * Calls UnRegisterShutdownClient with synchronous semantics.
- *
- * All const parameters are input parameters to this method.
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- /**
- * Calls UnRegisterShutdownClient with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
-
- /**
- * Calls RegisterShutdownClient with synchronous semantics.
- *
- * All const parameters are input parameters to this method.
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- /**
- * Calls RegisterShutdownClient with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
-
- /**
- * Calls GetNodeState with synchronous semantics.
- *
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId);
- /**
- * Calls GetNodeState with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
-
- /**
- * Calls GetSessionState with synchronous semantics.
- *
- * All const parameters are input parameters to this method.
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
- /**
- * Calls GetSessionState with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
-
- /**
- * Calls SetSessionState with synchronous semantics.
- *
- * All const parameters are input parameters to this method.
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- /**
- * Calls SetSessionState with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback);
-
- /// Returns the CommonAPI address of the remote partner this proxy communicates with.
- virtual std::string getAddress() const;
-
- /// Returns the domain of the remote partner this proxy communicates with.
- virtual const std::string& getDomain() const;
-
- /// Returns the service ID of the remote partner this proxy communicates with.
- virtual const std::string& getServiceId() const;
-
- /// Returns the instance ID of the remote partner this proxy communicates with.
- virtual const std::string& getInstanceId() const;
-
- /// Returns true if the remote partner for this proxy is available.
- virtual bool isAvailable() const;
-
- /**
- * Returns the wrapper class that is used to (de-)register for notifications about
- * the availability of the remote partner of this proxy.
- */
- virtual CommonAPI::ProxyStatusEvent& getProxyStatusEvent();
-
- /**
- * Returns the wrapper class that is used to access version information of the remote
- * partner of this proxy.
- */
- virtual CommonAPI::InterfaceVersionAttribute& getInterfaceVersionAttribute();
-
- private:
- std::shared_ptr<ConsumerProxyBase> delegate_;
-};
-
-namespace ConsumerExtensions {
- template <template <typename > class _ExtensionType>
- class BootModeAttributeExtension {
- public:
- typedef _ExtensionType<ConsumerProxyBase::BootModeAttribute> extension_type;
-
- static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::BootModeAttribute>, extension_type>::value,
- "Not CommonAPI Attribute Extension!");
-
- BootModeAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getBootModeAttribute()) {
- }
-
- inline extension_type& getBootModeAttributeExtension() {
- return attributeExtension_;
- }
-
- private:
- extension_type attributeExtension_;
- };
-
- template <template <typename > class _ExtensionType>
- class RestartReasonAttributeExtension {
- public:
- typedef _ExtensionType<ConsumerProxyBase::RestartReasonAttribute> extension_type;
-
- static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::RestartReasonAttribute>, extension_type>::value,
- "Not CommonAPI Attribute Extension!");
-
- RestartReasonAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getRestartReasonAttribute()) {
- }
-
- inline extension_type& getRestartReasonAttributeExtension() {
- return attributeExtension_;
- }
-
- private:
- extension_type attributeExtension_;
- };
-
- template <template <typename > class _ExtensionType>
- class ShutdownReasonAttributeExtension {
- public:
- typedef _ExtensionType<ConsumerProxyBase::ShutdownReasonAttribute> extension_type;
-
- static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::ShutdownReasonAttribute>, extension_type>::value,
- "Not CommonAPI Attribute Extension!");
-
- ShutdownReasonAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getShutdownReasonAttribute()) {
- }
-
- inline extension_type& getShutdownReasonAttributeExtension() {
- return attributeExtension_;
- }
-
- private:
- extension_type attributeExtension_;
- };
-
- template <template <typename > class _ExtensionType>
- class WakeUpReasonAttributeExtension {
- public:
- typedef _ExtensionType<ConsumerProxyBase::WakeUpReasonAttribute> extension_type;
-
- static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::WakeUpReasonAttribute>, extension_type>::value,
- "Not CommonAPI Attribute Extension!");
-
- WakeUpReasonAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getWakeUpReasonAttribute()) {
- }
-
- inline extension_type& getWakeUpReasonAttributeExtension() {
- return attributeExtension_;
- }
-
- private:
- extension_type attributeExtension_;
- };
-
-} // namespace ConsumerExtensions
-
-//
-// ConsumerProxy Implementation
-//
-template <typename ... _AttributeExtensions>
-ConsumerProxy<_AttributeExtensions...>::ConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
- delegate_(std::dynamic_pointer_cast<ConsumerProxyBase>(delegate)),
- _AttributeExtensions(*(std::dynamic_pointer_cast<ConsumerProxyBase>(delegate)))... {
-}
-
-template <typename ... _AttributeExtensions>
-ConsumerProxy<_AttributeExtensions...>::~ConsumerProxy() {
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
- delegate_->GetAppHealthCount(callStatus, Count);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
- return delegate_->GetAppHealthCountAsync(callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->LifecycleRequestComplete(RequestId, Status, callStatus, ErrorCode);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
- return delegate_->LifecycleRequestCompleteAsync(RequestId, Status, callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
- delegate_->GetInterfaceVersion(callStatus, Version);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
- return delegate_->GetInterfaceVersionAsync(callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) {
- delegate_->GetApplicationMode(callStatus, ErrorCode, ApplicationModeId);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) {
- return delegate_->GetApplicationModeAsync(callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->UnRegisterSession(SessionName, SessionOwner, SeatID, callStatus, ErrorCode);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
- return delegate_->UnRegisterSessionAsync(SessionName, SessionOwner, SeatID, callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->RegisterSession(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) {
- return delegate_->RegisterSessionAsync(SessionName, SessionOwner, SeatID, SessionState, callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->UnRegisterShutdownClient(BusName, ObjName, ShutdownMode, callStatus, ErrorCode);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
- return delegate_->UnRegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->RegisterShutdownClient(BusName, ObjName, ShutdownMode, TimeoutMs, callStatus, ErrorCode);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
- return delegate_->RegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, TimeoutMs, callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) {
- delegate_->GetNodeState(callStatus, ErrorCode, NodeStateId);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
- return delegate_->GetNodeStateAsync(callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
- delegate_->GetSessionState(SessionName, SeatID, callStatus, SessionState, ErrorCode);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
- return delegate_->GetSessionStateAsync(SessionName, SeatID, callback);
-}
-
-template <typename ... _AttributeExtensions>
-void ConsumerProxy<_AttributeExtensions...>::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->SetSessionState(SessionName, SessionOwner, SessionState, SeatID, callStatus, ErrorCode);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) {
- return delegate_->SetSessionStateAsync(SessionName, SessionOwner, SessionState, SeatID, callback);
-}
-
-
-template <typename ... _AttributeExtensions>
-std::string ConsumerProxy<_AttributeExtensions...>::getAddress() const {
- return delegate_->getAddress();
-}
-
-template <typename ... _AttributeExtensions>
-const std::string& ConsumerProxy<_AttributeExtensions...>::getDomain() const {
- return delegate_->getDomain();
-}
-
-template <typename ... _AttributeExtensions>
-const std::string& ConsumerProxy<_AttributeExtensions...>::getServiceId() const {
- return delegate_->getServiceId();
-}
-
-template <typename ... _AttributeExtensions>
-const std::string& ConsumerProxy<_AttributeExtensions...>::getInstanceId() const {
- return delegate_->getInstanceId();
-}
-
-template <typename ... _AttributeExtensions>
-bool ConsumerProxy<_AttributeExtensions...>::isAvailable() const {
- return delegate_->isAvailable();
-}
-
-template <typename ... _AttributeExtensions>
-CommonAPI::ProxyStatusEvent& ConsumerProxy<_AttributeExtensions...>::getProxyStatusEvent() {
- return delegate_->getProxyStatusEvent();
-}
-
-template <typename ... _AttributeExtensions>
-CommonAPI::InterfaceVersionAttribute& ConsumerProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
- return delegate_->getInterfaceVersionAttribute();
-}
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-namespace CommonAPI {
-template<template<typename > class _AttributeExtension>
-struct DefaultAttributeProxyFactoryHelper<org::genivi::NodeStateManager::ConsumerProxy,
- _AttributeExtension> {
- typedef typename org::genivi::NodeStateManager::ConsumerProxy<
- org::genivi::NodeStateManager::ConsumerExtensions::BootModeAttributeExtension<_AttributeExtension>,
- org::genivi::NodeStateManager::ConsumerExtensions::RestartReasonAttributeExtension<_AttributeExtension>,
- org::genivi::NodeStateManager::ConsumerExtensions::ShutdownReasonAttributeExtension<_AttributeExtension>,
- org::genivi::NodeStateManager::ConsumerExtensions::WakeUpReasonAttributeExtension<_AttributeExtension>
- > class_t;
-};
-}
-
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_
diff --git a/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h b/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
deleted file mode 100644
index a226480..0000000
--- a/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
+++ /dev/null
@@ -1,99 +0,0 @@
- /*
- * This file was generated by the CommonAPI Generators.
- *
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
- */
- #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_
- #define ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_
-
- #include "Consumer.h"
-
-
-
- #define COMMONAPI_INTERNAL_COMPILATION
-
-
- #include <CommonAPI/Attribute.h>
- #include <CommonAPI/Event.h>
- #include <CommonAPI/Proxy.h>
- #include <functional>
- #include <future>
-
- #undef COMMONAPI_INTERNAL_COMPILATION
-
- namespace org {
- namespace genivi {
- namespace NodeStateManager {
-
- class ConsumerProxyBase: virtual public CommonAPI::Proxy {
- public:
- typedef CommonAPI::ReadonlyAttribute<int32_t> BootModeAttribute;
- typedef CommonAPI::ReadonlyAttribute<int32_t> RestartReasonAttribute;
- typedef CommonAPI::ReadonlyAttribute<int32_t> ShutdownReasonAttribute;
- typedef CommonAPI::ReadonlyAttribute<int32_t> WakeUpReasonAttribute;
- typedef CommonAPI::Event<int32_t> NodeApplicationModeEvent;
- typedef CommonAPI::Event<std::string, int32_t, int32_t> SessionStateChangedEvent;
- typedef CommonAPI::Event<int32_t> NodeStateEvent;
- typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetAppHealthCountAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> LifecycleRequestCompleteAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetInterfaceVersionAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetApplicationModeAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterSessionAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterSessionAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterShutdownClientAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterShutdownClientAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetNodeStateAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetSessionStateAsyncCallback;
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> SetSessionStateAsyncCallback;
-
- virtual BootModeAttribute& getBootModeAttribute() = 0;
- virtual RestartReasonAttribute& getRestartReasonAttribute() = 0;
- virtual ShutdownReasonAttribute& getShutdownReasonAttribute() = 0;
- virtual WakeUpReasonAttribute& getWakeUpReasonAttribute() = 0;
-
- virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() = 0;
- virtual SessionStateChangedEvent& getSessionStateChangedEvent() = 0;
- virtual NodeStateEvent& getNodeStateEvent() = 0;
-
-
- virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) = 0;
- virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) = 0;
-
- virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) = 0;
-
- virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) = 0;
- virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) = 0;
-
- virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) = 0;
- virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) = 0;
-
- virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) = 0;
-
- virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) = 0;
-
- virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) = 0;
-
- virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) = 0;
-
- virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) = 0;
- virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback) = 0;
-
- virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) = 0;
-
- virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) = 0;
- };
-
- } // namespace NodeStateManager
- } // namespace genivi
- } // namespace org
-
- #endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_
diff --git a/src-gen/org/genivi/NodeStateManager/ConsumerStub.h b/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
deleted file mode 100644
index 4d4aebb..0000000
--- a/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_
-
-
-
-
-#include "Consumer.h"
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-
-#include <CommonAPI/Stub.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-/**
- * Receives messages from remote and handles all dispatching of deserialized calls
- * to a stub for the service Consumer. Also provides means to send broadcasts
- * and attribute-changed-notifications of observable attributes as defined by this service.
- * An application developer should not need to bother with this class.
- */
-class ConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public Consumer {
- public:
-
- /**
- * Sends a broadcast event for NodeApplicationMode. Should not be called directly.
- * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
- */
- virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) = 0;
- /**
- * Sends a broadcast event for SessionStateChanged. Should not be called directly.
- * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
- */
- virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0;
- /**
- * Sends a broadcast event for NodeState. Should not be called directly.
- * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
- */
- virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
-};
-
-
-/**
- * Defines the necessary callbacks to handle remote set events related to the attributes
- * defined in the IDL description for Consumer.
- * For each attribute two callbacks are defined:
- * - a verification callback that allows to verify the requested value and to prevent setting
- * e.g. an invalid value ("onRemoteSet<AttributeName>").
- * - an action callback to do local work after the attribute value has been changed
- * ("onRemote<AttributeName>Changed").
- *
- * This class and the one below are the ones an application developer needs to have
- * a look at if he wants to implement a service.
- */
-class ConsumerStubRemoteEvent {
- public:
- virtual ~ConsumerStubRemoteEvent() { }
-
- /// Verification callback for remote set requests on the attribute BootMode.
- virtual bool onRemoteSetBootModeAttribute(int32_t BootMode) = 0;
- /// Action callback for remote set requests on the attribute BootMode.
- virtual void onRemoteBootModeAttributeChanged() = 0;
-
- /// Verification callback for remote set requests on the attribute RestartReason.
- virtual bool onRemoteSetRestartReasonAttribute(int32_t RestartReason) = 0;
- /// Action callback for remote set requests on the attribute RestartReason.
- virtual void onRemoteRestartReasonAttributeChanged() = 0;
-
- /// Verification callback for remote set requests on the attribute ShutdownReason.
- virtual bool onRemoteSetShutdownReasonAttribute(int32_t ShutdownReason) = 0;
- /// Action callback for remote set requests on the attribute ShutdownReason.
- virtual void onRemoteShutdownReasonAttributeChanged() = 0;
-
- /// Verification callback for remote set requests on the attribute WakeUpReason.
- virtual bool onRemoteSetWakeUpReasonAttribute(int32_t WakeUpReason) = 0;
- /// Action callback for remote set requests on the attribute WakeUpReason.
- virtual void onRemoteWakeUpReasonAttributeChanged() = 0;
-
-};
-
-
-/**
- * Defines the interface that must be implemented by any class that should provide
- * the service Consumer to remote clients.
- * 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 ConsumerStub : public CommonAPI::Stub<ConsumerStubAdapter , ConsumerStubRemoteEvent> {
- public:
- virtual ~ConsumerStub() { }
-
- /// Provides getter access to the attribute BootMode.
- virtual const int32_t& getBootModeAttribute() = 0;
- /// Provides getter access to the attribute RestartReason.
- virtual const int32_t& getRestartReasonAttribute() = 0;
- /// Provides getter access to the attribute ShutdownReason.
- virtual const int32_t& getShutdownReasonAttribute() = 0;
- /// Provides getter access to the attribute WakeUpReason.
- virtual const int32_t& getWakeUpReasonAttribute() = 0;
-
- /// This is the method that will be called on remote calls on the method GetAppHealthCount.
- virtual void GetAppHealthCount(uint32_t& Count) = 0;
- /// This is the method that will be called on remote calls on the method LifecycleRequestComplete.
- virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method GetInterfaceVersion.
- virtual void GetInterfaceVersion(uint32_t& Version) = 0;
- /// This is the method that will be called on remote calls on the method GetApplicationMode.
- virtual void GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId) = 0;
- /// This is the method that will be called on remote calls on the method UnRegisterSession.
- virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method RegisterSession.
- virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method UnRegisterShutdownClient.
- virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method RegisterShutdownClient.
- virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method GetNodeState.
- virtual void GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId) = 0;
- /// This is the method that will be called on remote calls on the method GetSessionState.
- virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) = 0;
- /// This is the method that will be called on remote calls on the method SetSessionState.
- virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) = 0;
-
- /// Sends a broadcast event for NodeApplicationMode.
- virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) = 0;
- /// Sends a broadcast event for SessionStateChanged.
- virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0;
- /// Sends a broadcast event for NodeState.
- virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
-};
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_
diff --git a/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp b/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
deleted file mode 100644
index 2cacb2f..0000000
--- a/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#include <org/genivi/NodeStateManager/ConsumerStubDefault.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-ConsumerStubDefault::ConsumerStubDefault():
- remoteEventHandler_(this) {
-}
-
-ConsumerStubRemoteEvent* ConsumerStubDefault::initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter) {
- stubAdapter_ = stubAdapter;
- return &remoteEventHandler_;
-}
-
-const int32_t& ConsumerStubDefault::getBootModeAttribute() {
- return bootModeAttributeValue_;
-}
-
-void ConsumerStubDefault::setBootModeAttribute(int32_t value) {
- trySetBootModeAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::onRemoteBootModeAttributeChanged() {
- // No operation in default
-}
-
-bool ConsumerStubDefault::trySetBootModeAttribute(int32_t value) {
- if (!validateBootModeAttributeRequestedValue(value))
- return false;
-
- const bool valueChanged = (bootModeAttributeValue_ != value);
- bootModeAttributeValue_ = std::move(value);
- return valueChanged;
-}
-
-bool ConsumerStubDefault::validateBootModeAttributeRequestedValue(const int32_t& value) {
- return true;
-}
-
-bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetBootModeAttribute(int32_t value) {
- return defaultStub_->trySetBootModeAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::RemoteEventHandler::onRemoteBootModeAttributeChanged() {
- defaultStub_->onRemoteBootModeAttributeChanged();
-}
-
-const int32_t& ConsumerStubDefault::getRestartReasonAttribute() {
- return restartReasonAttributeValue_;
-}
-
-void ConsumerStubDefault::setRestartReasonAttribute(int32_t value) {
- trySetRestartReasonAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::onRemoteRestartReasonAttributeChanged() {
- // No operation in default
-}
-
-bool ConsumerStubDefault::trySetRestartReasonAttribute(int32_t value) {
- if (!validateRestartReasonAttributeRequestedValue(value))
- return false;
-
- const bool valueChanged = (restartReasonAttributeValue_ != value);
- restartReasonAttributeValue_ = std::move(value);
- return valueChanged;
-}
-
-bool ConsumerStubDefault::validateRestartReasonAttributeRequestedValue(const int32_t& value) {
- return true;
-}
-
-bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetRestartReasonAttribute(int32_t value) {
- return defaultStub_->trySetRestartReasonAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::RemoteEventHandler::onRemoteRestartReasonAttributeChanged() {
- defaultStub_->onRemoteRestartReasonAttributeChanged();
-}
-
-const int32_t& ConsumerStubDefault::getShutdownReasonAttribute() {
- return shutdownReasonAttributeValue_;
-}
-
-void ConsumerStubDefault::setShutdownReasonAttribute(int32_t value) {
- trySetShutdownReasonAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::onRemoteShutdownReasonAttributeChanged() {
- // No operation in default
-}
-
-bool ConsumerStubDefault::trySetShutdownReasonAttribute(int32_t value) {
- if (!validateShutdownReasonAttributeRequestedValue(value))
- return false;
-
- const bool valueChanged = (shutdownReasonAttributeValue_ != value);
- shutdownReasonAttributeValue_ = std::move(value);
- return valueChanged;
-}
-
-bool ConsumerStubDefault::validateShutdownReasonAttributeRequestedValue(const int32_t& value) {
- return true;
-}
-
-bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetShutdownReasonAttribute(int32_t value) {
- return defaultStub_->trySetShutdownReasonAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::RemoteEventHandler::onRemoteShutdownReasonAttributeChanged() {
- defaultStub_->onRemoteShutdownReasonAttributeChanged();
-}
-
-const int32_t& ConsumerStubDefault::getWakeUpReasonAttribute() {
- return wakeUpReasonAttributeValue_;
-}
-
-void ConsumerStubDefault::setWakeUpReasonAttribute(int32_t value) {
- trySetWakeUpReasonAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::onRemoteWakeUpReasonAttributeChanged() {
- // No operation in default
-}
-
-bool ConsumerStubDefault::trySetWakeUpReasonAttribute(int32_t value) {
- if (!validateWakeUpReasonAttributeRequestedValue(value))
- return false;
-
- const bool valueChanged = (wakeUpReasonAttributeValue_ != value);
- wakeUpReasonAttributeValue_ = std::move(value);
- return valueChanged;
-}
-
-bool ConsumerStubDefault::validateWakeUpReasonAttributeRequestedValue(const int32_t& value) {
- return true;
-}
-
-bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetWakeUpReasonAttribute(int32_t value) {
- return defaultStub_->trySetWakeUpReasonAttribute(std::move(value));
-}
-
-void ConsumerStubDefault::RemoteEventHandler::onRemoteWakeUpReasonAttributeChanged() {
- defaultStub_->onRemoteWakeUpReasonAttributeChanged();
-}
-
-
-void ConsumerStubDefault::GetAppHealthCount(uint32_t& Count) {
- // No operation in default
-}
-
-void ConsumerStubDefault::LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) {
- // No operation in default
-}
-
-void ConsumerStubDefault::GetInterfaceVersion(uint32_t& Version) {
- // No operation in default
-}
-
-void ConsumerStubDefault::GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId) {
- // No operation in default
-}
-
-void ConsumerStubDefault::UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) {
- // No operation in default
-}
-
-void ConsumerStubDefault::RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) {
- // No operation in default
-}
-
-void ConsumerStubDefault::UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) {
- // No operation in default
-}
-
-void ConsumerStubDefault::RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) {
- // No operation in default
-}
-
-void ConsumerStubDefault::GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId) {
- // No operation in default
-}
-
-void ConsumerStubDefault::GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) {
- // No operation in default
-}
-
-void ConsumerStubDefault::SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) {
- // No operation in default
-}
-
-
-void ConsumerStubDefault::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) {
- stubAdapter_->fireNodeApplicationModeEvent(ApplicationModeId);
-}
-void ConsumerStubDefault::fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) {
- stubAdapter_->fireSessionStateChangedEvent(SessionStateName, SeatID, SessionState);
-}
-void ConsumerStubDefault::fireNodeStateEvent(const int32_t& NodeState) {
- stubAdapter_->fireNodeStateEvent(NodeState);
-}
-
-ConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(ConsumerStubDefault* defaultStub):
- defaultStub_(defaultStub) {
-}
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
diff --git a/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h b/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
deleted file mode 100644
index 7cc92f9..0000000
--- a/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
-
-#include <org/genivi/NodeStateManager/ConsumerStub.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-/**
- * Provides a default implementation for ConsumerStubRemoteEvent and
- * ConsumerStub. Method callbacks have an empty implementation,
- * remote set calls on attributes will always change the value of the attribute
- * to the one received.
- *
- * Override this stub if you only want to provide a subset of the functionality
- * that would be defined for this service, and/or if you do not need any non-default
- * behaviour.
- */
-class ConsumerStubDefault : public ConsumerStub {
- public:
- ConsumerStubDefault();
-
- ConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter);
-
- virtual const int32_t& getBootModeAttribute();
- virtual void setBootModeAttribute(int32_t value);
-
- virtual const int32_t& getRestartReasonAttribute();
- virtual void setRestartReasonAttribute(int32_t value);
-
- virtual const int32_t& getShutdownReasonAttribute();
- virtual void setShutdownReasonAttribute(int32_t value);
-
- virtual const int32_t& getWakeUpReasonAttribute();
- virtual void setWakeUpReasonAttribute(int32_t value);
-
-
- virtual void GetAppHealthCount(uint32_t& Count);
-
- virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode);
-
- virtual void GetInterfaceVersion(uint32_t& Version);
-
- virtual void GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId);
-
- virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode);
-
- virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode);
-
- virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode);
-
- virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode);
-
- virtual void GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId);
-
- virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode);
-
- virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode);
-
-
- virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
- virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
- virtual void fireNodeStateEvent(const int32_t& NodeState);
-
- protected:
- virtual void onRemoteBootModeAttributeChanged();
- virtual bool trySetBootModeAttribute(int32_t value);
- virtual bool validateBootModeAttributeRequestedValue(const int32_t& value);
-
- virtual void onRemoteRestartReasonAttributeChanged();
- virtual bool trySetRestartReasonAttribute(int32_t value);
- virtual bool validateRestartReasonAttributeRequestedValue(const int32_t& value);
-
- virtual void onRemoteShutdownReasonAttributeChanged();
- virtual bool trySetShutdownReasonAttribute(int32_t value);
- virtual bool validateShutdownReasonAttributeRequestedValue(const int32_t& value);
-
- virtual void onRemoteWakeUpReasonAttributeChanged();
- virtual bool trySetWakeUpReasonAttribute(int32_t value);
- virtual bool validateWakeUpReasonAttributeRequestedValue(const int32_t& value);
-
-
- private:
- class RemoteEventHandler: public ConsumerStubRemoteEvent {
- public:
- RemoteEventHandler(ConsumerStubDefault* defaultStub);
-
- virtual bool onRemoteSetBootModeAttribute(int32_t value);
- virtual void onRemoteBootModeAttributeChanged();
-
- virtual bool onRemoteSetRestartReasonAttribute(int32_t value);
- virtual void onRemoteRestartReasonAttributeChanged();
-
- virtual bool onRemoteSetShutdownReasonAttribute(int32_t value);
- virtual void onRemoteShutdownReasonAttributeChanged();
-
- virtual bool onRemoteSetWakeUpReasonAttribute(int32_t value);
- virtual void onRemoteWakeUpReasonAttributeChanged();
-
-
- private:
- ConsumerStubDefault* defaultStub_;
- };
-
- RemoteEventHandler remoteEventHandler_;
- std::shared_ptr<ConsumerStubAdapter> stubAdapter_;
-
- int32_t bootModeAttributeValue_;
- int32_t restartReasonAttributeValue_;
- int32_t shutdownReasonAttributeValue_;
- int32_t wakeUpReasonAttributeValue_;
-};
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
deleted file mode 100644
index 674e11b..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_
-
-
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/types.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-class LifeCycleConsumer {
- public:
- virtual ~LifeCycleConsumer() { }
-
- static inline const char* getInterfaceId();
- static inline CommonAPI::Version getInterfaceVersion();
-};
-
-const char* LifeCycleConsumer::getInterfaceId() {
- return "org.genivi.NodeStateManager.LifeCycleConsumer";
-}
-
-CommonAPI::Version LifeCycleConsumer::getInterfaceVersion() {
- return CommonAPI::Version(1, 0);
-}
-
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-namespace CommonAPI {
-
-}
-
-
-namespace std {
- //hashes for types
-
- //hashes for error types
-}
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
deleted file mode 100644
index 40f18e6..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#include "LifeCycleConsumerDBusProxy.h"
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createLifeCycleConsumerDBusProxy(
- const std::string& commonApiAddress,
- const std::string& interfaceName,
- const std::string& busName,
- const std::string& objectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection) {
- return std::make_shared<LifeCycleConsumerDBusProxy>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection);
-}
-
-__attribute__((constructor)) void registerLifeCycleConsumerDBusProxy(void) {
- CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(LifeCycleConsumer::getInterfaceId(),
- &createLifeCycleConsumerDBusProxy);
-}
-
-LifeCycleConsumerDBusProxy::LifeCycleConsumerDBusProxy(
- const std::string& commonApiAddress,
- const std::string& interfaceName,
- const std::string& busName,
- const std::string& objectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection):
- CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
- {
-}
-
-
-
-void LifeCycleConsumerDBusProxy::LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, uint32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
- *this,
- "LifecycleRequest",
- "uu",
- Request, RequestId,
- callStatus
- , ErrorCode);
-}
-std::future<CommonAPI::CallStatus> LifeCycleConsumerDBusProxy::LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) {
- return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, uint32_t>,
- CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
- *this,
- "LifecycleRequest",
- "uu",
- Request, RequestId,
- std::move(callback));
-}
-
-void LifeCycleConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
- ownVersionMajor = 1;
- ownVersionMinor = 0;
-}
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
deleted file mode 100644
index 351558d..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_
-
-#include <org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h>
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/DBus/DBusFactory.h>
-#include <CommonAPI/DBus/DBusProxy.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-#include <string>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy {
- public:
- LifeCycleConsumerDBusProxy(
- const std::string& commonApiAddress,
- const std::string& interfaceName,
- const std::string& busName,
- const std::string& objectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection);
-
- virtual ~LifeCycleConsumerDBusProxy() { }
-
-
-
-
- virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback);
-
- virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
-
- private:
-
-};
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
deleted file mode 100644
index f59fb96..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#include "LifeCycleConsumerDBusStubAdapter.h"
-#include <org/genivi/NodeStateManager/LifeCycleConsumer.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createLifeCycleConsumerDBusStubAdapter(
- const std::string& commonApiAddress,
- const std::string& interfaceName,
- const std::string& busName,
- const std::string& objectPath,
- const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection,
- const std::shared_ptr<CommonAPI::StubBase>& stubBase) {
- return std::make_shared<LifeCycleConsumerDBusStubAdapter>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase);
-}
-
-__attribute__((constructor)) void registerLifeCycleConsumerDBusStubAdapter(void) {
- CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(LifeCycleConsumer::getInterfaceId(),
- &createLifeCycleConsumerDBusStubAdapter);
-}
-
-LifeCycleConsumerDBusStubAdapter::LifeCycleConsumerDBusStubAdapter(
- 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):
- LifeCycleConsumerDBusStubAdapterHelper(commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, dbusConnection, std::dynamic_pointer_cast<LifeCycleConsumerStub>(stub)) {
-}
-
-const char* LifeCycleConsumerDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
- return
- "<method name=\"LifecycleRequest\">\n"
- "<arg name=\"Request\" type=\"u\" direction=\"in\" />\n"
- "<arg name=\"RequestId\" type=\"u\" direction=\"in\" />\n"
- "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
- "</method>\n"
- ;
-}
-
-
-
-static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
- LifeCycleConsumerStub,
- std::tuple<uint32_t, uint32_t>,
- std::tuple<int32_t>
- > lifecycleRequestStubDispatcher(&LifeCycleConsumerStub::LifecycleRequest, "i");
-
-
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-template<>
-const org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
- { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher }
-};
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
deleted file mode 100644
index e6073ea..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
-
-#include <org/genivi/NodeStateManager/LifeCycleConsumerStub.h>
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-#include <CommonAPI/DBus/DBusStubAdapterHelper.h>
-#include <CommonAPI/DBus/DBusFactory.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-typedef CommonAPI::DBus::DBusStubAdapterHelper<LifeCycleConsumerStub> LifeCycleConsumerDBusStubAdapterHelper;
-
-class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper {
- public:
- LifeCycleConsumerDBusStubAdapter(
- 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);
-
-
-
- protected:
- virtual const char* getMethodsDBusIntrospectionXmlData() const;
-};
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
deleted file mode 100644
index 9289e83..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_
-
-#include "LifeCycleConsumerProxyBase.h"
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-template <typename ... _AttributeExtensions>
-class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public LifeCycleConsumerProxyBase, public _AttributeExtensions... {
- public:
- LifeCycleConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
- ~LifeCycleConsumerProxy();
-
-
-
-
- /**
- * Calls LifecycleRequest with synchronous semantics.
- *
- * All const parameters are input parameters to this method.
- * All non-const parameters will be filled with the returned values.
- * The CallStatus will be filled when the method returns and indicate either
- * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
- * will be set.
- * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
- */
- virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
- /**
- * Calls LifecycleRequest with asynchronous semantics.
- *
- * The provided callback will be called when the reply to this call arrives or
- * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
- * or which type of error has occurred. In case of any error, ONLY the CallStatus
- * will have a defined value.
- * 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> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback);
-
- /// Returns the CommonAPI address of the remote partner this proxy communicates with.
- virtual std::string getAddress() const;
-
- /// Returns the domain of the remote partner this proxy communicates with.
- virtual const std::string& getDomain() const;
-
- /// Returns the service ID of the remote partner this proxy communicates with.
- virtual const std::string& getServiceId() const;
-
- /// Returns the instance ID of the remote partner this proxy communicates with.
- virtual const std::string& getInstanceId() const;
-
- /// Returns true if the remote partner for this proxy is available.
- virtual bool isAvailable() const;
-
- /**
- * Returns the wrapper class that is used to (de-)register for notifications about
- * the availability of the remote partner of this proxy.
- */
- virtual CommonAPI::ProxyStatusEvent& getProxyStatusEvent();
-
- /**
- * Returns the wrapper class that is used to access version information of the remote
- * partner of this proxy.
- */
- virtual CommonAPI::InterfaceVersionAttribute& getInterfaceVersionAttribute();
-
- private:
- std::shared_ptr<LifeCycleConsumerProxyBase> delegate_;
-};
-
-
-//
-// LifeCycleConsumerProxy Implementation
-//
-template <typename ... _AttributeExtensions>
-LifeCycleConsumerProxy<_AttributeExtensions...>::LifeCycleConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
- delegate_(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)),
- _AttributeExtensions(*(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)))... {
-}
-
-template <typename ... _AttributeExtensions>
-LifeCycleConsumerProxy<_AttributeExtensions...>::~LifeCycleConsumerProxy() {
-}
-
-template <typename ... _AttributeExtensions>
-void LifeCycleConsumerProxy<_AttributeExtensions...>::LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
- delegate_->LifecycleRequest(Request, RequestId, callStatus, ErrorCode);
-}
-
-template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> LifeCycleConsumerProxy<_AttributeExtensions...>::LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) {
- return delegate_->LifecycleRequestAsync(Request, RequestId, callback);
-}
-
-
-template <typename ... _AttributeExtensions>
-std::string LifeCycleConsumerProxy<_AttributeExtensions...>::getAddress() const {
- return delegate_->getAddress();
-}
-
-template <typename ... _AttributeExtensions>
-const std::string& LifeCycleConsumerProxy<_AttributeExtensions...>::getDomain() const {
- return delegate_->getDomain();
-}
-
-template <typename ... _AttributeExtensions>
-const std::string& LifeCycleConsumerProxy<_AttributeExtensions...>::getServiceId() const {
- return delegate_->getServiceId();
-}
-
-template <typename ... _AttributeExtensions>
-const std::string& LifeCycleConsumerProxy<_AttributeExtensions...>::getInstanceId() const {
- return delegate_->getInstanceId();
-}
-
-template <typename ... _AttributeExtensions>
-bool LifeCycleConsumerProxy<_AttributeExtensions...>::isAvailable() const {
- return delegate_->isAvailable();
-}
-
-template <typename ... _AttributeExtensions>
-CommonAPI::ProxyStatusEvent& LifeCycleConsumerProxy<_AttributeExtensions...>::getProxyStatusEvent() {
- return delegate_->getProxyStatusEvent();
-}
-
-template <typename ... _AttributeExtensions>
-CommonAPI::InterfaceVersionAttribute& LifeCycleConsumerProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
- return delegate_->getInterfaceVersionAttribute();
-}
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
deleted file mode 100644
index 7ee8471..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
+++ /dev/null
@@ -1,43 +0,0 @@
- /*
- * This file was generated by the CommonAPI Generators.
- *
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
- */
- #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_
- #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_
-
- #include "LifeCycleConsumer.h"
-
-
-
- #define COMMONAPI_INTERNAL_COMPILATION
-
-
- #include <CommonAPI/Proxy.h>
- #include <functional>
- #include <future>
-
- #undef COMMONAPI_INTERNAL_COMPILATION
-
- namespace org {
- namespace genivi {
- namespace NodeStateManager {
-
- class LifeCycleConsumerProxyBase: virtual public CommonAPI::Proxy {
- public:
- typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> LifecycleRequestAsyncCallback;
-
-
-
-
- virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
- virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) = 0;
- };
-
- } // namespace NodeStateManager
- } // namespace genivi
- } // namespace org
-
- #endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
deleted file mode 100644
index b7d83fd..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_
-
-
-
-
-#include "LifeCycleConsumer.h"
-
-#define COMMONAPI_INTERNAL_COMPILATION
-
-
-#include <CommonAPI/Stub.h>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-/**
- * Receives messages from remote and handles all dispatching of deserialized calls
- * to a stub for the service LifeCycleConsumer. Also provides means to send broadcasts
- * and attribute-changed-notifications of observable attributes as defined by this service.
- * An application developer should not need to bother with this class.
- */
-class LifeCycleConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public LifeCycleConsumer {
- public:
-
-};
-
-
-/**
- * Defines the necessary callbacks to handle remote set events related to the attributes
- * defined in the IDL description for LifeCycleConsumer.
- * For each attribute two callbacks are defined:
- * - a verification callback that allows to verify the requested value and to prevent setting
- * e.g. an invalid value ("onRemoteSet<AttributeName>").
- * - an action callback to do local work after the attribute value has been changed
- * ("onRemote<AttributeName>Changed").
- *
- * This class and the one below are the ones an application developer needs to have
- * a look at if he wants to implement a service.
- */
-class LifeCycleConsumerStubRemoteEvent {
- public:
- virtual ~LifeCycleConsumerStubRemoteEvent() { }
-
-};
-
-
-/**
- * Defines the interface that must be implemented by any class that should provide
- * the service LifeCycleConsumer to remote clients.
- * 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 LifeCycleConsumerStub : public CommonAPI::Stub<LifeCycleConsumerStubAdapter , LifeCycleConsumerStubRemoteEvent> {
- public:
- virtual ~LifeCycleConsumerStub() { }
-
-
- /// This is the method that will be called on remote calls on the method LifecycleRequest.
- virtual void LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) = 0;
-
-};
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
deleted file mode 100644
index cc7dbfd..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#include <org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-LifeCycleConsumerStubDefault::LifeCycleConsumerStubDefault():
- remoteEventHandler_(this) {
-}
-
-LifeCycleConsumerStubRemoteEvent* LifeCycleConsumerStubDefault::initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter) {
- stubAdapter_ = stubAdapter;
- return &remoteEventHandler_;
-}
-
-
-void LifeCycleConsumerStubDefault::LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) {
- // No operation in default
-}
-
-
-
-LifeCycleConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub):
- defaultStub_(defaultStub) {
-}
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
diff --git a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h b/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
deleted file mode 100644
index 22e86ab..0000000
--- a/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-*
- * Copyright (C) 2013, BMW AG
- *
- * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013
-*/
-#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
-#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
-
-#include <org/genivi/NodeStateManager/LifeCycleConsumerStub.h>
-
-namespace org {
-namespace genivi {
-namespace NodeStateManager {
-
-/**
- * Provides a default implementation for LifeCycleConsumerStubRemoteEvent and
- * LifeCycleConsumerStub. Method callbacks have an empty implementation,
- * remote set calls on attributes will always change the value of the attribute
- * to the one received.
- *
- * Override this stub if you only want to provide a subset of the functionality
- * that would be defined for this service, and/or if you do not need any non-default
- * behaviour.
- */
-class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub {
- public:
- LifeCycleConsumerStubDefault();
-
- LifeCycleConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter);
-
-
- virtual void LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode);
-
-
-
- protected:
-
- private:
- class RemoteEventHandler: public LifeCycleConsumerStubRemoteEvent {
- public:
- RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub);
-
-
- private:
- LifeCycleConsumerStubDefault* defaultStub_;
- };
-
- RemoteEventHandler remoteEventHandler_;
- std::shared_ptr<LifeCycleConsumerStubAdapter> stubAdapter_;
-
-};
-
-} // namespace NodeStateManager
-} // namespace genivi
-} // namespace org
-
-#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_