diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-06 20:11:13 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-06 20:11:13 +0100 |
| commit | f23f9c3ecf40636f176107f6098c308f72fdbd5d (patch) | |
| tree | 56343b3086da79c629ee58655a7f6886f1f85676 | |
| parent | e553e5bc869df63d2e8d3fa0c581b3798db9b439 (diff) | |
| download | audiomanager-f23f9c3ecf40636f176107f6098c308f72fdbd5d.tar.gz | |
* removed all documentation to new place
* removed GENIVI copyright from headers
* [GDLT-41] changed DLT dependency to 2.5.0
115 files changed, 196 insertions, 930 deletions
diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt index d787b34..5bfd513 100644 --- a/AudioManagerDaemon/CMakeLists.txt +++ b/AudioManagerDaemon/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (C) 2012, GENIVI Alliance, Inc. # Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmCommandReceiver.h b/AudioManagerDaemon/include/CAmCommandReceiver.h index ee1134f..0459614 100644 --- a/AudioManagerDaemon/include/CAmCommandReceiver.h +++ b/AudioManagerDaemon/include/CAmCommandReceiver.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmCommandSender.h b/AudioManagerDaemon/include/CAmCommandSender.h index 6c4e013..4605da4 100644 --- a/AudioManagerDaemon/include/CAmCommandSender.h +++ b/AudioManagerDaemon/include/CAmCommandSender.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmControlReceiver.h b/AudioManagerDaemon/include/CAmControlReceiver.h index bcc642e..a911706 100644 --- a/AudioManagerDaemon/include/CAmControlReceiver.h +++ b/AudioManagerDaemon/include/CAmControlReceiver.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmControlSender.h b/AudioManagerDaemon/include/CAmControlSender.h index 5d7a169..2a9c0fa 100644 --- a/AudioManagerDaemon/include/CAmControlSender.h +++ b/AudioManagerDaemon/include/CAmControlSender.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmDatabaseHandler.h b/AudioManagerDaemon/include/CAmDatabaseHandler.h index 7b1e48e..6bd5b85 100644 --- a/AudioManagerDaemon/include/CAmDatabaseHandler.h +++ b/AudioManagerDaemon/include/CAmDatabaseHandler.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmDatabaseObserver.h b/AudioManagerDaemon/include/CAmDatabaseObserver.h index 78c60a6..9d89ef8 100644 --- a/AudioManagerDaemon/include/CAmDatabaseObserver.h +++ b/AudioManagerDaemon/include/CAmDatabaseObserver.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmRouter.h b/AudioManagerDaemon/include/CAmRouter.h index 9b2b4d2..7268f3c 100644 --- a/AudioManagerDaemon/include/CAmRouter.h +++ b/AudioManagerDaemon/include/CAmRouter.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmRoutingReceiver.h b/AudioManagerDaemon/include/CAmRoutingReceiver.h index 73bad28..e8558c1 100644 --- a/AudioManagerDaemon/include/CAmRoutingReceiver.h +++ b/AudioManagerDaemon/include/CAmRoutingReceiver.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmRoutingSender.h b/AudioManagerDaemon/include/CAmRoutingSender.h index 41d48de..499d196 100644 --- a/AudioManagerDaemon/include/CAmRoutingSender.h +++ b/AudioManagerDaemon/include/CAmRoutingSender.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmTelnetMenuHelper.h b/AudioManagerDaemon/include/CAmTelnetMenuHelper.h index 24125e1..d14dcbb 100644 --- a/AudioManagerDaemon/include/CAmTelnetMenuHelper.h +++ b/AudioManagerDaemon/include/CAmTelnetMenuHelper.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/CAmTelnetServer.h b/AudioManagerDaemon/include/CAmTelnetServer.h index 32701a2..bfcd145 100644 --- a/AudioManagerDaemon/include/CAmTelnetServer.h +++ b/AudioManagerDaemon/include/CAmTelnetServer.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/include/DAmDoxygenMainPage.h b/AudioManagerDaemon/include/DAmDoxygenMainPage.h deleted file mode 100644 index 369b4c9..0000000 --- a/AudioManagerDaemon/include/DAmDoxygenMainPage.h +++ /dev/null @@ -1,403 +0,0 @@ -/** - * \mainpage - * - * \image html genivilogo.png - * - * Copyright (C) 2012, GENIVI Alliance, Inc. - * 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 Mueller (christian.ei.mueller@bmw.de) - * - * \par More information - * can be found at https://collab.genivi.org/wiki/display/genivi/GENIVI+Home \n - * - * \par About AudioManager - * The AudioManager is a Deamon that manages all Audio Connections in a GENIVI headunit. - * It is a managing instance that uses so called RoutingAdaptors to control AudioDomains that then do the "real" connections. - * - */ - -/** - * \page lic License - * \section contr Code Contribution License - * The contribution is done under GENIVI CLA, please see here: - * https://collab.genivi.org/wiki/display/genivi/Code+Contribution+Team - * \section split License Split - * The licenses of this project are split into two parts:\n - * 1. the AudioManagerDaemon, licensed under MPL 2.0\n - * 2. all other parts that serve as example code that can be taken to build up an own project with it these parts are licensed - * \section mpl Mozilla Public License, v. 2.0 - * http://mozilla.org/MPL/2.0/ - * \section mit MIT license - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/** - * \page architecturepage Architecture Overview - * - * The architecture concept bases on the partition of management (logic) and routing (action). Sinks and sources are clustered - * into independent parts which are capable of exchanging audio with each other (AudioDomains). Between these AudioDomains, - * Audio can be interchanged via Gateways. \n - * Since the routing and the management shall be independent from the actual used system, it is realized as an OwnedComponent, - * the AudioManager. Each AudioDomain has a Routing Adapter which implements some necessary logic and is the interface between - * the AudioManager and the AudioDomains. - * - * \section domains Audio Domains - * - * \image html AudioDomains.gif - * An Audio Domain consists of sinks and sources that can exchange audio with each other. To make the most out of the concept, - * AudioDomains shall be chosen in such a way that they are implemented by already existing audio routing engines. - * - * The AudioManager assumes that there are no restrictions in interconnection of sinks and sources. One or more sources can be - * connected to one sink and one or more sinks can be connected to one source. Since real hardware or software might end up in - * having restrictions, the knowledge of this must exist in the AudioManager and handled by him accordingly. This shall be - * accomplished via a plug-in mechanism. An AudioDomain is not tied to a hardware or software implementation. It can be software - * or hardware or even a combination of both. \n - * - * Examples for possible audio domains:\n - * PulseAudio, Alsa, Jack, DSP, FPGA, MOST, In-chip switching matrix\n - * - * The clustering and usage of the AudioDomains will vary from each product. Care must be taken while choosing the right AudioDomains - * in regards to system load (due to resampling), latency and of course flexibility.\n - * In special implementations of the AudioDomain, it is capable of operation a certain time without interaction to the AudioManager. - * This is needed to fulfill the requirements for Early & Late Audio, more information can be found below. - * am::am_Domain_s describe the attribiutes of a domain. - * - * \section routing_adaptor Routing Adapter - * - * Via this adapter, the interconnection from the AudioManager to the AudioDomains is accomplished. An AudioDomain shall have exactly - * one RoutingAdapter. In the terms of GENIVI, a RoutingAdapter is an AbstractComponent, this means that we define an API and a certain - * behavior in UML models but do not maintain components itself. Existing implementations from Proof of Concepts are shipped as example - * Adapters "as is" but cannot be seen as maintained components.\n - * The implementation of a routing adapter can and will vary from each project to another since the combination of sinks and sources, - * the used hardware etc has influence on the adapters. Besides interchanging and abstracting information between the AudioManager and - * the sinks and sources, the Adapters also need to implement some business logic in order to interact with the AudioManager. - * This include for example the registering of components, managing the current state, error handling etc.\n - * In the special case of an EarlyDomain, the routing adapter also has to manage start-up and rundown including persistence for his - * domain while the AudioManager is not started or already stopped. During this periods of time, these special adapters have to be able - * to fulfill basic tasks like changing volumes, for example (this implies that the Adapter is implemented on a different piece of - * hardware, e.g. vehicle processor). - * - * \section gateway Gateway - * - * \image html Gateway.gif - * - * Gateways are used to let audio flow between two domains. They always have a direction and can only transport one stream at a time. - * Several gateways connecting the same domains together can exist in parallel so that more than one source can be connected to more - * than one sink from the same domains at the same time.\n - * In principle, gateways have the ability to convert the connectionFormat of an audiostream, for example the sink could receive audio - * in a digital form and output it as analog (sound card). In order to express the conversion capabilities of a gateway, a matrix of - * all source/sink connectionFormats is given (details below). The sources and sinks of a gateway are registered like ordinary sources - * and sinks where the domains have the responsibility to register "their" sinks and sources.\n - * For every gateway, a controlDomain is defined, this is the domain that registered the gateway. At the time of registering, the ID of - * the "other end" of the gateway might be unknown. To handle this situation, a domain can "peek" Domains, Sources and Sinks. When - * something is peeked, it means that an ID is reserved for a unique name without registering it.\n - * If a gateway is deregistered, the source or sink of the controlling domain is deregistered as well - not the one in the "other" domain. - */ - -/** - * \page audiomanagercomponentspage AudioManager Components - * \image html AudioManagement.png - * - * The AudioManager is the central managing instance of the Audio architecture. It is designed as an OwnedComponent, this means that the - * software is maintained within GENIVI as open source component. The AudioManager consists of 4 central components.\n - * - * - * \section audiomanagercomponents AudioManagerDaemon - * - * This component is owned and maintained by Genivi. It is the central audio framework component. There can be only one daemon in a system (singleton).\n - * The AudioManagerDaemon is subject to this documentation - * - * \section commander AudioManagerCommandPlugin - * - * This describes the interface towards the Commanding Instances of the AudioManagerDaemon. This is the HMI and interrupt sources that use this - * interface to start their interrupt and stop it again. The interface shall be asynchronous. Via this interface all user interactions are handled. - * This component is designed to be a dynamic linked library that will be loaded on the startup of the AudioManager. There can be more than one - * CommandPlugin at a time. - * Since the implementation of this component is project specific, only examples are included.\n - * An example Dbus Implementation can be found in the folder PluginCommandInterfaceDbus. - * \n - * All commands that must be fulfilled by an AudioManagerCommandPlugin are described in am::IAmCommandSend.\n - * All commands that are presented to AudioManagerCommandPlugin by the AudioManagerDaemon are described in am::IAmCommandReceive.\n - * - * \section controller AudioManagerController - * The controller is the intelligent "heart" of the AudioManager and it is project specific. In principle, the controller gets commands from the command - * interface or events from outside and reacts to them. For this purpose, some basic commands are in the "toolbox" of the Controller that he can use - * to interact with the rest of the system.\n - * Among this there are commands to read/write the database and to perform actions on the Audiodomains like connect or disconnect. There must be only one - * Controller in the system at a time, like the AudioManagerCommandPlugins, the Controller is loaded at startup by the daemon\n - * A simple example Implementation can be found in the folder PluginControlInterface. - * \n - * All commands that must be fulfilled by an AudioManagerController are described in am::IAmControlSend.\n - * All commands that are presented to AudioManagerController by the AudioManagerDaemon are described in am::IAmControlReceive.\n - * - * \section router Routing AudioManagerRoutingPlugin - * - * The AudioManagerRoutingPlugins are used to abstract the actual Hard- and Software that does the routing. There can be more than one plugins at a - * time, they are loaded at startup time like the commandplugins. \n - * The AudioManager expects a bus-like structure behind each plug-in, so that a plug-in can implement a bus interface and proxy the messages to the - * routing adapters - the AudioManager is capable of addressing more than one adapter one each plug-in. The AudioManagerController does not have to - * know anything about the real system plugins - he sends his commands to sources and sinks. The daemon does the dispatching of these commands. - * The interface is mainly asynchronous.\ - * Sample plugins can be found in the directory, for example PluginRoutingInterfaceAsync.\n - * \n - * All commands that must be fulfilled by an AudioManagerRoutingPlugin are described in am::IAmRoutingSend.\n - * All commands that are presented to AudioManagerRoutingPlugins by the AudioManagerDaemon are described in am::IAmRoutingReceive.\n - * - * \page elementspage Elements of the AudioManagement - * - * The audiomanagement in principle consists of the following elements: - * - * \section source Sources - * This is where audio comes from, for examples tuner, mediaplayer. But sources can also be part of a building block that processes audio, examples - * are here crossfaders or gateways. Several Sinks can be connected to one source.\n - * \subsection sourceattributes Attributes - * - am::am_SourceType_s describes the attributes that are accessible from the AudioManagerCommandPlugins.\n - * - am::am_Source_s describes the general attributes.\n - * - * \section sinks Sinks - * This is where audio flows to, for examples amplifier, headphones. But sources can also be part of a building block that processes audio, - * examples are here crossfaders or gateways. Several Sources can be connected to one sink.\n - * \subsection sinkattributes Attributes - * - am::am_SinkType_s describes the attribiutes that are accessible form the AudioManagerCommandPlugins.\n - * - am::am_Sink_s describes the general attributes.\n - * - * \section gw Gateways - * Gateways are described here: \ref gateway - * A specialitry of a gateways is the convertionmatrix. It indicates which sinksoundformats can be transferred in which sourcesoundformats. A convertion - * matrix looks like this: - * \image html GatewayMatrix.png - * \subsection gwattributes Attributes - * - am::am_Gateway_s describe the attribiutes of a gateway\n - * - * \section crossfaders Crossfaders - * Cross-faders are special elements that can perform cross-fading between two sources connected to the sinks of the crossfader. The audio of either source - * or both (mixed, during the fade) is put out at the source of the fader. Cross-fading within a source (for example from one song to another) is out of - * scope audio management and must be performed in the source.\n - * A crossfader has two sinks and one source, where one sink is the "hot" one. It is in the duty of the AudioManagerController to connect the correct - * sources to the sinks in order to perform a cross-fade. When fading is started, the hotSink changes from either HS_SINKA or HS_SINKB to HS_INTERMEDIATE, - * when the fading is finished, it changes to HS_SINKA or HS_SINKB (the sink that was "cold" before).Fading itself is done in the RoutingAdapters, the - * implementation has to ensure the smooth and synchronous change of volumes. With different rampTypes, different kinds of cross-fade ramps can be supported. - * The actual status of the "hot" sink is reported by the routingAdapter. Care has to be taken that the correct "hot" end of the crossfader is given - * at registration time.\n - * \subsection cfattributes Attributes - * - am::am_Crossfader_s describes the attribiutes of a Crossfader - * - */ - -/** - * \page uniquepage About unique IDs : Static vs Dynamic IDs - * - * \section why Why having two different kinds of ids?\n - * The complexity of up-to-date IVI-systems demand to support sources and sinks dynamically added and removed in order to support the variety of CE products, - * but parts of the system are never going to change - to start a dynamic registration here is a waste of system capacity.\n - * \section setup The setup - * The AudioManagement is capable of handling static, dynamic or mixed setups. In case of a dynamic setup, all elements of the system like domains, sinks, - * sources, gateways etc are registered at system start-up. In a static setup, the IDs of the elements are known and fixed - no further registration is needed. - * The start-up for static elements works as follows:\n - * when a domain known as static (this is knowledge of the AudioManagerController, recognized by the unique name of the domain) registers, the - * AudioManagerController enters all elements of this domain in the database. Still, this domain can register additional elements during runtime. - * In case of static setups, the RoutingAdapter needs to ensure that all static elements are ready to be used when the domain registers.\n - * In order to ensure the uniqueness of IDs, there exist two separate ID areas (for each of sources, sinks, gateways and crossfaders):\n\n - * Fixed area (from 1..100)\n - * Variable area (starting from 101)\n\n - * In case of dynamic added elements, the audiomanagerdaemon ensures the uniqueness of the ID's, in case of the static setup, the project has to ensure the - * uniqueness by assigning the IDs wisely. The knowledge of the static IDs need to be in the AudioManagerController, the RoutingAdapters and in the HMI - * (optional because IDs will be reported anyway).\n - * Domains cannot be static because registering them is the trigger for the AudioManagerController to enter the static values into the database. - * - */ - -/** - * \page classficationpage Classification of Sinks and Sources - * \section classification Classification - * The AudioManagement offers classification for sources and sinks. It can be used to group sources and sinks together and link certain behaviors to these groups. - * An example for such a use is to group all interrupt sources in a class together and let the AudioManagerController react different for this class.\n - * Elements can only have one class at a time. The AudioManagerDaemon will take care of registration of sourceClasses, sinkClasses and will assign unique IDs, - * but the parameters of the Classes itself are product specific and have to be interpreted by the AudioManagerController. This concept allows for very individual - * implementations of system behaviors.\n - * Since Classes are held in the database, Classes can be registered and deregistered during runtime, it is recommended that the AudioManagerController enters - * all source & sink classes at start-up into the database.A ClassProperty exists out of an enumeration (am_ClassProperty_e, project specific) and a corresponding - * value (integer) that is interpreted by the AudioManagerController according to am_ClassProperty_e.\n - * There is no restriction to the number of properties a class can have and how many classes can exist in a system.\n - * \section attributes Attributes - * - am::am_SourceClass_s describes the attributes of a source class\n - * - am::am_SinkClass_s describes the attributes of a sink class\n - * - */ - -/** - * \page interrupts Interrups & Low Level Interrupts - * \section diff Differences - * The only difference between a "normal" interrupt and a source for the audioManagement may lie in it's classification, so playing a "normal" interrupt is not - * different to changing a source. An exception here are the so called "low level interrupts".\n - * \section crit Criterias - * These are special sources that fulfill the following criteria: - * - direct connection to a sink that is "always on", so no extra actions and communications need to be done in order to play audio - * - no dependencies to the current system state need to be checked before playing. This means that the source knows if it is allowed to play at the moment it - * wants to play - * - all information for the source that is needed to judge if it is allowed to play or not is either directly retrieved by the source or set static via a property. - * - * This becomes very handy for implementing such things like park distance control. When the source is informed that it needs to output signals - * (due to an emerging wall for example) it outputs the beeps directly to the amplifier that then overlays the sound to the current active source.\n - * Settings that influence the behavior of low level interrupts like for example volume offset for park distance control or sound on/off for it need to be done via - * sourceProperties on the source level, so that the judgment and the adoptions that need to be taken can be taken by the source without system interaction. - * In order to give the AudioManagerController the chance to react on a low level interrupt (by lowering the main volume for example), a feedback path is provided - * and the AudioManagerController is informed about the current state of the low level interrupt (via hooklInterruptStatusChange).\n - * - */ - -/** - * \page connpage Connections & MainConnections - * \section con Connections - * A connection connects a source to a sink to let audio data flow. The direction of the flow is always source to sink. For each connection the connectionFormat - * must be defined when the connection is demanded, if source or sink is not capable of supporting this format, the connection cannot be established. - * ConnectionFormats are product specific, also are some standard formats defined within GENIVI that can be enhanced in the product area. Examples of formats: - * analog, autodefined, stereo 48khz 16bit PCM, .... - * - * \section maincon Mainconnections - * is visible to the HMI and consists out of one or more connections. A MainConnection shall always connect a Source and a Sink visible to the HMI. - * In contradiction to connections, the MainConnection does not know about connectionFormat. MainConnections are demanded by the commandInterface. - * This picture demonstrates the relation between MainConnections and connections: - * \image html Levels.png - * - * \section att Attributes - * - am::am_Connection_s describes the attributes of a conenction - * - am::am_MainConnection_s describes the attributes of a MainConnection - */ - - /** \page lip Lipsync - * \section t The Task of the Audiomanager - * It is the job of the AudioManager to retrieve all latency timing information from each connection, to aggregate this information and provide a latency # - * information on a per MainConnection Basis. It is not the task of the AudioManager to actually delay or speed up video or audio signals to achieve a lipsync. - * The actual correction shall be done in the with the information provided by the AudioManager. - * The time information is always reported by the routingadapters for each connection. Delays that are introduced in a sink or a gateway are counting for the - * connection that connects to this sink or gateway. - * \section ex Example - * \image html delay.jpg - * - * This graph shows how the delay is calculated: - * - Connection 1 has a delay 2ms + 60ms that is added due to the gateway - * - Connection 2 has a delay 0ms + 10ms due to sink - * So the routing adapters report 62ms and 10ms, the audiomanager will add this to 72ms and report this value for the main connection from sink to source. - * The videoplayer getting this information can now delay his video against the audio for 72ms and be in perfect lipsync.\n - * After the buildup of a connection the first timing information needs to be sent within 5 seconds, the timing information from the routing adapters need to - * be sent via 4 seconds. If the latency for a connection is variable and changes over lifetime of the connection, the routing adapters shall resend the value - * and the audiomanager will correct the over all latency. - */ - -/** - * \page early Early Audio - * \section req The Requirement - * The requirement reviews showed that one very important aspect of managing audio within GENIVI is the early/late phase where the Linux part of the system is - * not available. This feature is addressed via special domains: EarlyDomains. These domains are acting "unmanaged" - meaning without the interaction with the - * AudioManager - providing a simpler set of features until the AudioManager is up and running. When the Linux system is then fully operable a handover is done - * from the EarlyDomains towards the AudioManager. In order to be able to operate without the Linux up and running, the EarlyDomains must be implemented on a - * second fast-boot or always-on controller, e.g. the so called vehicle processor.\n - * \section earlys Early Startup - * This picture shows the principle of the early startup: - * \image html early.png - * \section late Late Rundown - * This picture shows the principle of the late rundown: - * \image html late.png - * - */ - -/** - * \page views The two views of the AudioManager - * In general, there are two views of the system:\n - * \section command The CommandInterface View View - * This is an abstracted view that the HMI and other controlling Instances have of the system. Every Information (with some little exceptions) here is maintained - * by the AudioManagerController, so that he can "fake" situations for the HMI. - * So why is that? Depending on the actual project it might be - for example - that not the volume at the sink must be changed, but instead of the source. - * The HMI does not know about sourceVolumes (and does not need to!) so the HMI would change the sink volume and the AudioManagerController can translate it to a - * sourceVolumeChange. The metrics of the volumes are different as well. - * It is the duty of the AudioManagementController to keep the commandInterface information consistent with the "real" situation. - * \section route RoutingInterface View - * Here are the "real" system states. All changes that are done on this interface are maintained by the AudioMangerDaemon and here is the actual situation always - * consistent with the reality. All actions on this interface are either triggered by the AudioManagerController or by the domains itself, like registration for - * example. - * \section over Overview - * \image html views.png - */ - -/** - * \page vol Volumes & MainVolumes - * \section mainVol MainVolumes - * This is the volume at the CommanInterface level. The exact definition is project specific and can be adopted for each project since the AudioManagerController - * and the HMI are the only ones who need to interfere with this volume. The actual value is an integer. - * - am::am_mainVolume_t defines the mainvolume - * - * \section volv Volumes - * These are the actual volumes that are set for sources and sinks. The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be - * limited by actual project. - * - am::am_volume_t describes the volume - */ - -/** - * \page prop Properties - * \section soundprop SoundProperties & MainSoundProperties - * SoundProperties are properties that are related to either a source or a sink. They are product specific and are used to set source or sink specific properties. - * This could be for example: equalizer settings, relative volume offsets but also bool information "surround sound on/off". - * A soundProperty is defined by its type (am_SoundProperty_e, a product specific enum) and a value (integer) that is interpreted according to the type. - * There are not limits how many properties a sink or a source can have. SoundProperties in contradiction to MainSoundProperties are not visible to the - * CommandInterface.\n - * - am::am_SoundProperty_s describe the of the SoundProperties - * - am::am_MainSoundProperty_s describe the attributes of MainSoundProperties - * - * \section sys SystemProperties - * are properties that apply to the whole system or parts of it but cannot be tight to a specific sink or source. They are product specific and could be used - * for example to set general behavior like all interrupts on/off for example. The information is only exchanged between the commandInterface and the - * AudioManagerController. The AudioManagerController has to interpret the value and react accordingly. - * - am::am_SystemProperty_s describes the attributes of Systemproperties - */ - -/** - * \page misc Miscellaneous - * - * \section connfor Connection Formats - * Every flow of audio is using a format to exchange data. The format that the source and the sink uses must match together in order to have an undisturbed - * experience. It is common that sources and sinks are capable of supporting more than one audioformat.\n - * So all sources and sinks register with a list of connectionFormats that they support and for each connection a format must be chosen that is then used - * to transport the audio data. Gateways (and Soundconverters) have the information which connectionFormat can be transformed into another one. - * - am::am_ConnectionFormat_e has all formats listed. - * - * \section pers Persistence & Lifecycle - * Details of persistence can be done when the si-team have defined the components and interfaces in the Enterprise Architect model. - * So much is clear: the persistence will be based on POSIX interfaces that can be used to read and write data.\n - * Persistence is a very system specific topic: what needs to be remembered over lifecycles, what will be reset to default? So this needs to be done via the - * AudioMangerController. The Controller will then enter the values read from the persistence and write them to the daemon. - * The lifecycle itself will be handles by the daemon which will then fire hooks in the controller to make sure appropriate actions are taken. - * - * \section speed Speed dependent volume - * The adjustments for the speed are done product specific in the controller. The speed information itself is retrieved by the AudioManagerDaemon, sampled and - * quantified and forwarded to the controller. The interface in not yet defined !\n - * Turning speed controlled volume on/off and possible settings are achieved via SinkSoundProperty settings. - */ - -/** - * \page comp Compiling & Co - * \section readme Readme - * \include ../README - */ - -#ifndef MAINPAGE_H_ -#define MAINPAGE_H_ - -#endif /* MAINPAGE_H_ */ diff --git a/AudioManagerDaemon/include/TAmPluginTemplate.h b/AudioManagerDaemon/include/TAmPluginTemplate.h index 68fe786..2959b04 100644 --- a/AudioManagerDaemon/include/TAmPluginTemplate.h +++ b/AudioManagerDaemon/include/TAmPluginTemplate.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmCommandReceiver.cpp b/AudioManagerDaemon/src/CAmCommandReceiver.cpp index 95554bd..d656720 100644 --- a/AudioManagerDaemon/src/CAmCommandReceiver.cpp +++ b/AudioManagerDaemon/src/CAmCommandReceiver.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmCommandSender.cpp b/AudioManagerDaemon/src/CAmCommandSender.cpp index d16485f..fc71ce5 100644 --- a/AudioManagerDaemon/src/CAmCommandSender.cpp +++ b/AudioManagerDaemon/src/CAmCommandSender.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp index 3d64226..e7cee4b 100644 --- a/AudioManagerDaemon/src/CAmControlReceiver.cpp +++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmControlSender.cpp b/AudioManagerDaemon/src/CAmControlSender.cpp index 39c29a7..9d82dcb 100644 --- a/AudioManagerDaemon/src/CAmControlSender.cpp +++ b/AudioManagerDaemon/src/CAmControlSender.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmDatabaseHandler.cpp b/AudioManagerDaemon/src/CAmDatabaseHandler.cpp index a13b38c..5a5b6fb 100644 --- a/AudioManagerDaemon/src/CAmDatabaseHandler.cpp +++ b/AudioManagerDaemon/src/CAmDatabaseHandler.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmDatabaseObserver.cpp b/AudioManagerDaemon/src/CAmDatabaseObserver.cpp index 775b239..ae81a4e 100644 --- a/AudioManagerDaemon/src/CAmDatabaseObserver.cpp +++ b/AudioManagerDaemon/src/CAmDatabaseObserver.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmDbusWrapper.cpp b/AudioManagerDaemon/src/CAmDbusWrapper.cpp index 6148edf..115d33d 100644 --- a/AudioManagerDaemon/src/CAmDbusWrapper.cpp +++ b/AudioManagerDaemon/src/CAmDbusWrapper.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmDltWrapper.cpp b/AudioManagerDaemon/src/CAmDltWrapper.cpp index 7890e64..6b9e6a5 100644 --- a/AudioManagerDaemon/src/CAmDltWrapper.cpp +++ b/AudioManagerDaemon/src/CAmDltWrapper.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -25,6 +24,7 @@ #include <string> #include <sstream> #include <iostream> +#include <string.h> namespace am { @@ -46,6 +46,8 @@ void CAmDltWrapper::unregisterContext(DltContext & handle) { #ifdef WITH_DLT dlt_unregister_context(&handle); +#else + (void) handle; #endif } @@ -68,6 +70,9 @@ void CAmDltWrapper::registerApp(const char *appid, const char *description) dlt_register_app(appid, description); //register a default context dlt_register_context(&mDltContext, "def", "default Context registered by DLTWrapper CLass"); +#else + (void) appid; + (void) description; #endif } @@ -76,8 +81,8 @@ void CAmDltWrapper::registerContext(DltContext& handle, const char *contextid, c #ifdef WITH_DLT dlt_register_context(&handle, contextid, description); #else + (void) handle; memcpy(&mDltContext.contextID,contextid,4); - strlen(description); const size_t str_len = strlen(description); if(str_len < 2000) { @@ -89,6 +94,7 @@ void CAmDltWrapper::registerContext(DltContext& handle, const char *contextid, c void CAmDltWrapper::init(DltLogLevelType loglevel, DltContext* context) { + (void) loglevel; if (!context) context = &mDltContext; #ifdef WITH_DLT diff --git a/AudioManagerDaemon/src/CAmRouter.cpp b/AudioManagerDaemon/src/CAmRouter.cpp index fd394a9..fe5a960 100644 --- a/AudioManagerDaemon/src/CAmRouter.cpp +++ b/AudioManagerDaemon/src/CAmRouter.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp index 3e9aa65..ea6bfeb 100644 --- a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp +++ b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp index d14c826..e7594cf 100644 --- a/AudioManagerDaemon/src/CAmRoutingSender.cpp +++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmSocketHandler.cpp b/AudioManagerDaemon/src/CAmSocketHandler.cpp index d13ea7b..2ae1337 100644 --- a/AudioManagerDaemon/src/CAmSocketHandler.cpp +++ b/AudioManagerDaemon/src/CAmSocketHandler.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index 46dccf3..ce54286 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/CAmTelnetServer.cpp b/AudioManagerDaemon/src/CAmTelnetServer.cpp index 079e6e3..3af05af 100644 --- a/AudioManagerDaemon/src/CAmTelnetServer.cpp +++ b/AudioManagerDaemon/src/CAmTelnetServer.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index 9c5820d..c42640e 100644 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -21,12 +20,12 @@ * */ -//todo: create systemd compatibility -//todo: all communication like all plugins loaded etc... -//todo: check the startup sequence. Dbus shall be activated last... -//todo: there is a bug in the visible flags of sinks and sources. fix it. -//todo: clean up startup sequences controller, command and routing interfaces---- -//todo: package generation only works if package directory exists... +/** + * \todo create systemd compatibility + * \todo all communication like all plugins loaded etc... + * \todo check the startup sequence. Dbus shall be activated last... + * \bug package generation only works if package directory exists... + */ #include "config.h" @@ -61,9 +60,9 @@ #include "shared/CAmSocketHandler.h" +using namespace am; DLT_DECLARE_CONTEXT(AudioManager) -using namespace am; const char* USAGE_DESCRIPTION = "Usage:\tAudioManagerDaemon [options]\n" "options:\t\n" @@ -265,7 +264,7 @@ int main(int argc, char *argv[]) //parse the commandline options parseCommandLine(argc, (char**) argv); - CAmDltWrapper::instance(true)->registerApp("AudioManagerDeamon", "AudioManagerDeamon"); + CAmDltWrapper::instance(enableNoDLTDebug)->registerApp("AudioManagerDeamon", "AudioManagerDeamon"); CAmDltWrapper::instance()->registerContext(AudioManager, "Main", "Main Context"); logInfo("The Audiomanager is started"); logInfo("The version of the Audiomanager", DAEMONVERSION); diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp index e1fdb5e..4441f63 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h index 22a09de..408bdf3 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index 55380e0..936f969 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (C) 2012, GENIVI Alliance, Inc. # Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp index 89cd9a9..079625a 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h index 384ad58..7702fcc 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index 6fa2152..2cfdfeb 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (C) 2012, GENIVI Alliance, Inc. # Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp index 9fc4bd4..0758a01 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp +++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h index 70feb26..85f680d 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h +++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt index 5960544..f9f6c39 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (C) 2012, GENIVI Alliance, Inc. # Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp index 7c06f15..a5c82de 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h index 5aef70e..aac5b1e 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt index 857015f..e4ba858 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (C) 2012, GENIVI Alliance, Inc. # Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp index 5fb65ae..dadcd1f 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h index fad6aa0..5f74b20 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt index 39b43d7..92f117e 100644 --- a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (C) 2012, GENIVI Alliance, Inc. # Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp index ba9e11b..c907c76 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h index d0d8216..06d10fe 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index eb392f4..bcb9d9f 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (C) 2012, GENIVI Alliance, Inc. # Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp index 5877a2b..b11c3a2 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp +++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.h b/AudioManagerDaemon/test/CAmCommonFunctions.h index ec6c768..20d7de7 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.h +++ b/AudioManagerDaemon/test/CAmCommonFunctions.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/CMakeLists.txt b/AudioManagerDaemon/test/CMakeLists.txt index d3ba552..b8ea4a7 100644 --- a/AudioManagerDaemon/test/CMakeLists.txt +++ b/AudioManagerDaemon/test/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (C) 2012, GENIVI Alliance, Inc. # Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/IAmCommandBackdoor.h b/AudioManagerDaemon/test/IAmCommandBackdoor.h index 051b2ae..5a01c06 100644 --- a/AudioManagerDaemon/test/IAmCommandBackdoor.h +++ b/AudioManagerDaemon/test/IAmCommandBackdoor.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/IAmControlBackdoor.h b/AudioManagerDaemon/test/IAmControlBackdoor.h index 4f77ad6..3a1edef 100644 --- a/AudioManagerDaemon/test/IAmControlBackdoor.h +++ b/AudioManagerDaemon/test/IAmControlBackdoor.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/IAmRoutingBackdoor.h b/AudioManagerDaemon/test/IAmRoutingBackdoor.h index a30102f..31cfded 100644 --- a/AudioManagerDaemon/test/IAmRoutingBackdoor.h +++ b/AudioManagerDaemon/test/IAmRoutingBackdoor.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/MockIAmCommandSend.h b/AudioManagerDaemon/test/MockIAmCommandSend.h index 1efd20a..04f122d 100644 --- a/AudioManagerDaemon/test/MockIAmCommandSend.h +++ b/AudioManagerDaemon/test/MockIAmCommandSend.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h index 382e475..a21d284 100644 --- a/AudioManagerDaemon/test/MockIAmControlSend.h +++ b/AudioManagerDaemon/test/MockIAmControlSend.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/AudioManagerDaemon/test/MockIAmRoutingSend.h b/AudioManagerDaemon/test/MockIAmRoutingSend.h index 44b9195..9b1f66a 100644 --- a/AudioManagerDaemon/test/MockIAmRoutingSend.h +++ b/AudioManagerDaemon/test/MockIAmRoutingSend.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. diff --git a/CMakeLists.txt b/CMakeLists.txt index 5072274..e91d385 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (C) 2012, GENIVI Alliance, Inc. # Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. @@ -117,11 +116,11 @@ SET(DOXY_PROTOTYPE ${CMAKE_SOURCE_DIR}/cmake/DoxyFile.in) SET(DOXY_FILE ${CMAKE_CURRENT_BINARY_DIR}/DoxyFile) CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/config.cmake ${CMAKE_SOURCE_DIR}/include/config.h ) -CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/DoxyFile ) +CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/AudioManagerDaemon/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/DoxyFile ) IF(WITH_DLT) - pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) #this is due to BUGFIX [GDLT-41] + pkg_check_modules(DLT REQUIRED automotive-dlt>=2.5.0) #this is due to BUGFIX [GDLT-41] ENDIF(WITH_DLT) diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt index afba8d6..57d10a4 100644 --- a/PluginCommandInterfaceDbus/CMakeLists.txt +++ b/PluginCommandInterfaceDbus/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (c) 2012 GENIVI Alliance # Copyright (c) 2012 BMW # # author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h index bf21def..ad21109 100644 --- a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h +++ b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h index 50c1526..4cada87 100644 --- a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h +++ b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/include/IAmCommandReceiverShadow.h b/PluginCommandInterfaceDbus/include/IAmCommandReceiverShadow.h index c255bdf..758266d 100644 --- a/PluginCommandInterfaceDbus/include/IAmCommandReceiverShadow.h +++ b/PluginCommandInterfaceDbus/include/IAmCommandReceiverShadow.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp index a1d263a..7da6317 100644 --- a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp +++ b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 @@ -26,9 +26,9 @@ #include "shared/CAmDbusWrapper.h" +using namespace am; DLT_DECLARE_CONTEXT(commandDbus) -using namespace am; /** * factory for plugin loading diff --git a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp index 2a57a51..f84a994 100644 --- a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp +++ b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp index 55bef15..86ef443 100644 --- a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp +++ b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.cpp index 67b7792..f97c7b6 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.cpp +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.h b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.h index f0f7a4e..9aec152 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.h +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp index c5adecb..0ef24bc 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h index 9d3a058..8cc8fb2 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp index 3ff25ff..771a0d0 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h index 9a4aa64..40d7ff8 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h index 6141117..6b3babb 100644 --- a/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h +++ b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt index cd94d7f..fc88760 100644 --- a/PluginControlInterface/CMakeLists.txt +++ b/PluginControlInterface/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (c) 2012 GENIVI Alliance # Copyright (c) 2012 BMW # # author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginControlInterface/include/CAmControlSenderBase.h b/PluginControlInterface/include/CAmControlSenderBase.h index 20b97d1..7b07dfc 100644 --- a/PluginControlInterface/include/CAmControlSenderBase.h +++ b/PluginControlInterface/include/CAmControlSenderBase.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginControlInterface/include/IAmControlReceiverShadow.h b/PluginControlInterface/include/IAmControlReceiverShadow.h index f42fef7..830fc33 100644 --- a/PluginControlInterface/include/IAmControlReceiverShadow.h +++ b/PluginControlInterface/include/IAmControlReceiverShadow.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginControlInterface/src/CAmControlSenderBase.cpp b/PluginControlInterface/src/CAmControlSenderBase.cpp index 61e261d..046a7ac 100644 --- a/PluginControlInterface/src/CAmControlSenderBase.cpp +++ b/PluginControlInterface/src/CAmControlSenderBase.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginControlInterface/src/IAmControlReceiverShadow.cpp b/PluginControlInterface/src/IAmControlReceiverShadow.cpp index 4e2be5c..78083cc 100644 --- a/PluginControlInterface/src/IAmControlReceiverShadow.cpp +++ b/PluginControlInterface/src/IAmControlReceiverShadow.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginControlInterface/test/CAmControlReceiverShadowTest.cpp b/PluginControlInterface/test/CAmControlReceiverShadowTest.cpp index 2f0ee44..3f73366 100644 --- a/PluginControlInterface/test/CAmControlReceiverShadowTest.cpp +++ b/PluginControlInterface/test/CAmControlReceiverShadowTest.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginControlInterface/test/CAmControlReceiverShadowTest.h b/PluginControlInterface/test/CAmControlReceiverShadowTest.h index ae17386..9b31e2e 100644 --- a/PluginControlInterface/test/CAmControlReceiverShadowTest.h +++ b/PluginControlInterface/test/CAmControlReceiverShadowTest.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginControlInterface/test/MockIAmControlReceive.h b/PluginControlInterface/test/MockIAmControlReceive.h index 076bfae..09ef539 100644 --- a/PluginControlInterface/test/MockIAmControlReceive.h +++ b/PluginControlInterface/test/MockIAmControlReceive.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceAsync/CMakeLists.txt b/PluginRoutingInterfaceAsync/CMakeLists.txt index 62a8530..ca1e467 100644 --- a/PluginRoutingInterfaceAsync/CMakeLists.txt +++ b/PluginRoutingInterfaceAsync/CMakeLists.txt @@ -1,4 +1,3 @@ -# Copyright (c) 2012 GENIVI Alliance # Copyright (c) 2012 BMW # # author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceAsync/include/CAmRoutingSenderAsync.h b/PluginRoutingInterfaceAsync/include/CAmRoutingSenderAsync.h index 5b92841..ac78eba 100644 --- a/PluginRoutingInterfaceAsync/include/CAmRoutingSenderAsync.h +++ b/PluginRoutingInterfaceAsync/include/CAmRoutingSenderAsync.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceAsync/include/IAmRoutingReceiverShadow.h b/PluginRoutingInterfaceAsync/include/IAmRoutingReceiverShadow.h index 2dd9395..90ced6f 100644 --- a/PluginRoutingInterfaceAsync/include/IAmRoutingReceiverShadow.h +++ b/PluginRoutingInterfaceAsync/include/IAmRoutingReceiverShadow.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp b/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp index 4874bb7..a503388 100644 --- a/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp +++ b/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp b/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp index 144e8c5..5ab2360 100644 --- a/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp +++ b/PluginRoutingInterfaceAsync/src/IAmRoutingReceiverShadow.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp index 378e0b4..2c13512 100644 --- a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp +++ b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h index 6334040..3dc9ea1 100644 --- a/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h +++ b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h b/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h index e80d956..0554c5c 100644 --- a/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h +++ b/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h b/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h index bb32a9e..5a63395 100644 --- a/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h +++ b/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp index 89281ed..894ed87 100644 --- a/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp +++ b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 @@ -40,20 +40,20 @@ COMPILE PROGRAMS *********************************************************************************************************** - compile options with default values: - CMAKE_BUILD_TYPE - CMAKE_INSTALL_PREFIX /usr/local - USE_BUILD_LIBS OFF - WITH_DBUS_WRAPPER ON - WITH_DOCUMENTATION OFF - WITH_MAIN ON - WITH_PLUGIN_COMMAND ON - WITH_PLUGIN_CONTROL ON - WITH_PLUGIN_ROUTING ON - WITH_PPOLL ON - WITH_SIMPLEDBUS_LOOP OFF - WITH_SOCKETHANDLER_LOOP ON - WITH_TELNET OFF - WITH_TESTS ON + CMAKE_BUILD_TYPE + CMAKE_INSTALL_PREFIX /usr/local + GLIB_DBUS_TYPES_TOLERANT ON + USE_BUILD_LIBS ON + WITH_DBUS_WRAPPER ON + WITH_DLT ON + WITH_DOCUMENTATION OFF + WITH_MAIN ON + WITH_PLUGIN_COMMAND ON + WITH_PLUGIN_CONTROL ON + WITH_PLUGIN_ROUTING ON + WITH_PPOLL ON + WITH_TELNET ON + WITH_TESTS ON In order to change these options, you can modify this values with ccmake, do the appropriate changes in diff --git a/cmake/AudioDomains.gif b/cmake/AudioDomains.gif Binary files differdeleted file mode 100644 index d3f1c8d..0000000 --- a/cmake/AudioDomains.gif +++ /dev/null diff --git a/cmake/AudioManagement.png b/cmake/AudioManagement.png Binary files differdeleted file mode 100644 index 8d74798..0000000 --- a/cmake/AudioManagement.png +++ /dev/null diff --git a/cmake/Doxyfile.in b/cmake/Doxyfile.in deleted file mode 100644 index 5ba88f3..0000000 --- a/cmake/Doxyfile.in +++ /dev/null @@ -1,269 +0,0 @@ -# Doxyfile 1.6.3 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = AudioManager -PROJECT_NUMBER = @DAEMONVERSION@ -OUTPUT_DIRECTORY = @CMAKE_SOURCE_DIR@/doc -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = YES -JAVADOC_AUTOBRIEF = YES -QT_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = YES -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -OPTIMIZE_FOR_FORTRAN = NO -OPTIMIZE_OUTPUT_VHDL = NO -EXTENSION_MAPPING = -BUILTIN_STL_SUPPORT = YES -CPP_CLI_SUPPORT = YES -SIP_SUPPORT = NO -IDL_PROPERTY_SUPPORT = YES -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -TYPEDEF_HIDES_STRUCT = NO -SYMBOL_CACHE_SIZE = 0 -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = YES -EXTRACT_ANON_NSPACES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = NO -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -FORCE_LOCAL_INCLUDES = NO -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_MEMBERS_CTORS_1ST = YES -SORT_GROUP_NAMES = YES -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = NO -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = YES -SHOW_FILES = YES -SHOW_NAMESPACES = YES -FILE_VERSION_FILTER = -LAYOUT_FILE = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = YES -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text " -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = @CMAKE_CURRENT_SOURCE_DIR@ -INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.h \ - *.cpp -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = */test/* */Plugin*/* -EXCLUDE_SYMBOLS = -EXAMPLE_PATH = @CMAKE_SOURCE_DIR@ -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = @CMAKE_SOURCE_DIR@/cmake -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_COLORSTYLE_HUE = 220 -HTML_COLORSTYLE_SAT = 100 -HTML_COLORSTYLE_GAMMA = 80 -HTML_TIMESTAMP = YES -HTML_ALIGN_MEMBERS = YES -HTML_DYNAMIC_SECTIONS = YES -GENERATE_DOCSET = YES -DOCSET_FEEDNAME = "AudioManager docs" -DOCSET_BUNDLE_ID = org.genivi.AudioManager.Doxygen -DOCSET_PUBLISHER_ID = org.genivi.AudioManager.Publisher -DOCSET_PUBLISHER_NAME = genivi -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -CHM_INDEX_ENCODING = -BINARY_TOC = NO -TOC_EXPAND = NO -GENERATE_QHP = NO -QCH_FILE = -QHP_NAMESPACE = org.doxygen.Project -QHP_VIRTUAL_FOLDER = doc -QHP_CUST_FILTER_NAME = -QHP_CUST_FILTER_ATTRS = -QHP_SECT_FILTER_ATTRS = -QHG_LOCATION = -GENERATE_ECLIPSEHELP = NO -ECLIPSE_DOC_ID = org.genivi.AudioManager -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -USE_INLINE_TREES = YES -TREEVIEW_WIDTH = 250 -EXT_LINKS_IN_WINDOW = YES -FORMULA_FONTSIZE = 10 -SEARCHENGINE = YES -SERVER_BASED_SEARCH = NO -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -LATEX_SOURCE_CODE = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = @CMAKE_SOURCE_DIR@/man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = YES -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = YES -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = qtools_docs/qtools.tag=../../qtools_docs/html -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -MSCGEN_PATH = -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = YES -DOT_FONTNAME = FreeSans.ttf -DOT_FONTSIZE = 10 -DOT_FONTPATH = -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = YES -CALLER_GRAPH = YES -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -DOT_GRAPH_MAX_NODES = 50 -MAX_DOT_GRAPH_DEPTH = 0 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = YES -GENERATE_LEGEND = YES -DOT_CLEANUP = YES diff --git a/cmake/Gateway.gif b/cmake/Gateway.gif Binary files differdeleted file mode 100644 index 45badf9..0000000 --- a/cmake/Gateway.gif +++ /dev/null diff --git a/cmake/GatewayMatrix.png b/cmake/GatewayMatrix.png Binary files differdeleted file mode 100644 index dcc0682..0000000 --- a/cmake/GatewayMatrix.png +++ /dev/null diff --git a/cmake/Levels.png b/cmake/Levels.png Binary files differdeleted file mode 100644 index 9ba0886..0000000 --- a/cmake/Levels.png +++ /dev/null diff --git a/cmake/add_package_dependencies.sh b/cmake/add_package_dependencies.sh index de71317..66cd94b 100755 --- a/cmake/add_package_dependencies.sh +++ b/cmake/add_package_dependencies.sh @@ -1,5 +1,5 @@ # Copyright (C) 2012, GENIVI Alliance, Inc. -# Copyright (C) 2012, BMW AG + * Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. # diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in index 648ad51..bfa406d 100755 --- a/cmake/cmake_uninstall.cmake.in +++ b/cmake/cmake_uninstall.cmake.in @@ -1,5 +1,5 @@ # Copyright (C) 2012, GENIVI Alliance, Inc. -# Copyright (C) 2012, BMW AG + * Copyright (C) 2012, BMW AG # # This file is part of GENIVI Project AudioManager. # diff --git a/cmake/delay.jpg b/cmake/delay.jpg Binary files differdeleted file mode 100644 index 6b645b7..0000000 --- a/cmake/delay.jpg +++ /dev/null diff --git a/cmake/early.png b/cmake/early.png Binary files differdeleted file mode 100644 index 016cad7..0000000 --- a/cmake/early.png +++ /dev/null diff --git a/cmake/genivilogo.png b/cmake/genivilogo.png Binary files differdeleted file mode 100644 index d016ec8..0000000 --- a/cmake/genivilogo.png +++ /dev/null diff --git a/cmake/late.png b/cmake/late.png Binary files differdeleted file mode 100644 index 76753a8..0000000 --- a/cmake/late.png +++ /dev/null diff --git a/cmake/views.png b/cmake/views.png Binary files differdeleted file mode 100644 index d036ef4..0000000 --- a/cmake/views.png +++ /dev/null diff --git a/include/audiomanagertypes.h b/include/audiomanagertypes.h index c4a5954..a38e7e7 100644 --- a/include/audiomanagertypes.h +++ b/include/audiomanagertypes.h @@ -1,5 +1,4 @@ /**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -15,13 +14,13 @@ *
* \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
*
- * \file CAmCommandReceiver.h
+ * \file
* For further information see http://www.genivi.org/.
*
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_F324BBAC_CA26_4b9b_8BE7_166AB6A61889__INCLUDED_)
-#define EA_F324BBAC_CA26_4b9b_8BE7_166AB6A61889__INCLUDED_
+#if !defined(EA_FACD3063_1102_4d56_A616_6F63FAC9A011__INCLUDED_)
+#define EA_FACD3063_1102_4d56_A616_6F63FAC9A011__INCLUDED_
#include <stdint.h>
#include "projecttypes.h"
@@ -34,63 +33,63 @@ namespace am { /** * a domain ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_domainID_t; /** * a source ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_sourceID_t; /** * a sink ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_sinkID_t; /** * a gateway ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_gatewayID_t; /** * a crossfader ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_crossfaderID_t; /** * a connection ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_connectionID_t; /** * a mainConnection ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_mainConnectionID_t; /** * speed * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 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 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef int16_t am_volume_t; @@ -98,40 +97,40 @@ namespace am { * 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 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef int16_t am_mainVolume_t; /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_sourceClass_t; /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_sinkClass_t; /** * time in ms! * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_time_t; /** * offset time that is introduced in milli seconds. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 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 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_Availablility_e { @@ -153,7 +152,7 @@ namespace am { /** * represents the connection state * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_ConnectionState_e { @@ -183,7 +182,7 @@ namespace am { /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_DomainState_e { @@ -209,7 +208,7 @@ namespace am { /** * This enum characterizes the data of the EarlyData_t * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_EarlyDataType_e { @@ -239,7 +238,7 @@ namespace am { /** * the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_Error_e { @@ -292,7 +291,7 @@ namespace am { /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_MuteState_e { @@ -314,7 +313,7 @@ namespace am { /** * The source state reflects the state of the source * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_SourceState_e { @@ -337,7 +336,7 @@ namespace am { /** * This enumeration is used to define the type of the action that is correlated to a handle. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_Handle_e { @@ -357,7 +356,7 @@ namespace am { /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_InterruptState_e { @@ -379,7 +378,7 @@ namespace am { /** * describes the active sink of a crossfader. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_HotSink_e { @@ -405,7 +404,7 @@ namespace am { /** * this describes the availability of a sink or a source together with the latest change * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ struct am_Availability_s { @@ -425,7 +424,7 @@ namespace am { /** * describes class properties * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ struct am_ClassProperty_s { @@ -445,7 +444,7 @@ namespace am { /** * This struct describes the attribiutes of a crossfader. * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_Crossfader_s { @@ -485,7 +484,7 @@ namespace am { /** * This struct describes the attributes of a gateway. * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_Gateway_s { @@ -552,7 +551,7 @@ namespace am { /** * This represents one "hopp" in a route * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_RoutingElement_s { @@ -580,7 +579,7 @@ namespace am { /** * a list of routing elements that lead from source to sink * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_Route_s { @@ -604,7 +603,7 @@ namespace am { /** * struct describing the sound property * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_SoundProperty_s { @@ -624,7 +623,7 @@ namespace am { /** * struct describing system properties * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_SystemProperty_s { @@ -644,7 +643,7 @@ namespace am { /** * struct describing sinkclasses * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_SinkClass_s { @@ -668,7 +667,7 @@ namespace am { /** * struct describing source classes * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_SourceClass_s { @@ -692,7 +691,7 @@ namespace am { /** * this type holds all information of sources relevant to the HMI * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_SourceType_s { @@ -720,7 +719,7 @@ namespace am { /** * this type holds all information of sinks relevant to the HMI * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_SinkType_s { @@ -756,7 +755,7 @@ namespace am { /** * a handle is used for asynchronous operations and is uniquely assigned for each of this operations * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_Handle_s { @@ -776,7 +775,7 @@ namespace am { /** * struct describung mainsound property * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_MainSoundProperty_s { @@ -796,7 +795,7 @@ namespace am { /** * this type holds all information of connections relevant to the HMI * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_MainConnectionType_s { @@ -828,7 +827,7 @@ namespace am { /** * struct that holds attribiutes of a mainconnection * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_MainConnection_s { @@ -864,7 +863,7 @@ namespace am { /** * This struct describes the attribiutes of a sink * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_Sink_s { @@ -927,7 +926,7 @@ namespace am { /** * This struct describes the attribiutes of a source * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ struct am_Source_s { @@ -997,7 +996,7 @@ namespace am { /** * This struct describes the attribiutes of a domain * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ struct am_Domain_s { @@ -1037,7 +1036,7 @@ namespace am { /** * a connection * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ struct am_Connection_s { @@ -1071,7 +1070,7 @@ namespace am { * 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 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ union am_EarlyData_u { @@ -1087,7 +1086,7 @@ namespace am { * sourceID in case of ED_SOURCE_VOLUME, ED_SOURCE_PROPERTY
* sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ union am_DataType_u { @@ -1100,7 +1099,7 @@ namespace am { /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ struct am_EarlyData_s { @@ -1112,4 +1111,4 @@ namespace am { }; } -#endif // !defined(EA_F324BBAC_CA26_4b9b_8BE7_166AB6A61889__INCLUDED_) +#endif // !defined(EA_FACD3063_1102_4d56_A616_6F63FAC9A011__INCLUDED_) diff --git a/include/command/IAmCommandReceive.h b/include/command/IAmCommandReceive.h index 0847aaa..fe32aba 100644 --- a/include/command/IAmCommandReceive.h +++ b/include/command/IAmCommandReceive.h @@ -1,5 +1,4 @@ /**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -15,13 +14,13 @@ *
* \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
*
- * \file CAmCommandReceiver.h
+ * \file
* For further information see http://www.genivi.org/.
*
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_399CFD88_31F4_4806_9747_4F98FB938FFD__INCLUDED_)
-#define EA_399CFD88_31F4_4806_9747_4F98FB938FFD__INCLUDED_
+#if !defined(EA_DA0CD257_9FA2_49b6_AE6D_548273E438E1__INCLUDED_)
+#define EA_DA0CD257_9FA2_49b6_AE6D_548273E438E1__INCLUDED_
#include <vector>
#include <string>
@@ -44,7 +43,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n
* For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:48 AM + * @created 06-Mar-2012 8:01:07 PM */ class IAmCommandReceive { @@ -222,4 +221,4 @@ namespace am { }; } -#endif // !defined(EA_399CFD88_31F4_4806_9747_4F98FB938FFD__INCLUDED_) +#endif // !defined(EA_DA0CD257_9FA2_49b6_AE6D_548273E438E1__INCLUDED_) diff --git a/include/command/IAmCommandSend.h b/include/command/IAmCommandSend.h index 7832f61..93e195a 100644 --- a/include/command/IAmCommandSend.h +++ b/include/command/IAmCommandSend.h @@ -1,5 +1,4 @@ /**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -15,13 +14,13 @@ *
* \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
*
- * \file CAmCommandReceiver.h
+ * \file
* For further information see http://www.genivi.org/.
*
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_0E8D4103_1F90_467a_8935_61E9B1448750__INCLUDED_)
-#define EA_0E8D4103_1F90_467a_8935_61E9B1448750__INCLUDED_
+#if !defined(EA_7D83FF38_8EFF_42da_9D53_B196FE091604__INCLUDED_)
+#define EA_7D83FF38_8EFF_42da_9D53_B196FE091604__INCLUDED_
#include <vector>
#include <string>
@@ -45,7 +44,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n
* For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:48 AM + * @created 06-Mar-2012 8:01:07 PM */ class IAmCommandSend { @@ -196,4 +195,4 @@ namespace am { }; } -#endif // !defined(EA_0E8D4103_1F90_467a_8935_61E9B1448750__INCLUDED_) +#endif // !defined(EA_7D83FF38_8EFF_42da_9D53_B196FE091604__INCLUDED_) diff --git a/include/control/IAmControlReceive.h b/include/control/IAmControlReceive.h index 630aeaa..fe899ba 100644 --- a/include/control/IAmControlReceive.h +++ b/include/control/IAmControlReceive.h @@ -1,5 +1,4 @@ /**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -15,13 +14,13 @@ *
* \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
*
- * \file CAmCommandReceiver.h
+ * \file
* For further information see http://www.genivi.org/.
*
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_BB73C4DE_B91D_420d_B810_5DB4F937D21E__INCLUDED_)
-#define EA_BB73C4DE_B91D_420d_B810_5DB4F937D21E__INCLUDED_
+#if !defined(EA_FC4DEA6F_95C3_409f_83CE_63BF9A997339__INCLUDED_)
+#define EA_FC4DEA6F_95C3_409f_83CE_63BF9A997339__INCLUDED_
#include <vector>
#include <string>
@@ -43,7 +42,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n
* For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:48 AM + * @created 06-Mar-2012 8:01:07 PM */ class IAmControlReceive { @@ -616,4 +615,4 @@ namespace am { }; } -#endif // !defined(EA_BB73C4DE_B91D_420d_B810_5DB4F937D21E__INCLUDED_) +#endif // !defined(EA_FC4DEA6F_95C3_409f_83CE_63BF9A997339__INCLUDED_) diff --git a/include/control/IAmControlSend.h b/include/control/IAmControlSend.h index 11c3fdb..7f1cddc 100644 --- a/include/control/IAmControlSend.h +++ b/include/control/IAmControlSend.h @@ -1,5 +1,4 @@ /**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -15,13 +14,13 @@ *
* \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
*
- * \file CAmCommandReceiver.h
+ * \file
* For further information see http://www.genivi.org/.
*
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_2C445078_D868_40cc_8990_F7D396812DB7__INCLUDED_)
-#define EA_2C445078_D868_40cc_8990_F7D396812DB7__INCLUDED_
+#if !defined(EA_FB5AF069_7968_42a2_AB14_7C86BD1888E0__INCLUDED_)
+#define EA_FB5AF069_7968_42a2_AB14_7C86BD1888E0__INCLUDED_
#include <vector>
#include <string>
@@ -46,7 +45,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n
* For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:49 AM + * @created 06-Mar-2012 8:01:08 PM */ class IAmControlSend { @@ -392,4 +391,4 @@ namespace am { }; } -#endif // !defined(EA_2C445078_D868_40cc_8990_F7D396812DB7__INCLUDED_) +#endif // !defined(EA_FB5AF069_7968_42a2_AB14_7C86BD1888E0__INCLUDED_) diff --git a/include/projecttypes.h b/include/projecttypes.h index e4b7cb4..3118f46 100644 --- a/include/projecttypes.h +++ b/include/projecttypes.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance
+/**
* Copyright (c) 2012 BMW
*
* \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
diff --git a/include/routing/IAmRoutingReceive.h b/include/routing/IAmRoutingReceive.h index 1f6604a..45097ab 100644 --- a/include/routing/IAmRoutingReceive.h +++ b/include/routing/IAmRoutingReceive.h @@ -1,5 +1,4 @@ /**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -15,13 +14,13 @@ *
* \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
*
- * \file CAmCommandReceiver.h
+ * \file
* For further information see http://www.genivi.org/.
*
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_9D3B2457_92C4_44dd_81BF_0F54463031D5__INCLUDED_)
-#define EA_9D3B2457_92C4_44dd_81BF_0F54463031D5__INCLUDED_
+#if !defined(EA_F3B2C6E5_FEAE_42a2_AEB2_59B2AE54EE05__INCLUDED_)
+#define EA_F3B2C6E5_FEAE_42a2_AEB2_59B2AE54EE05__INCLUDED_
#include <vector>
#include <string>
@@ -45,7 +44,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n
* For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:49 AM + * @created 06-Mar-2012 8:01:08 PM */ class IAmRoutingReceive { @@ -350,4 +349,4 @@ namespace am { }; } -#endif // !defined(EA_9D3B2457_92C4_44dd_81BF_0F54463031D5__INCLUDED_) +#endif // !defined(EA_F3B2C6E5_FEAE_42a2_AEB2_59B2AE54EE05__INCLUDED_) diff --git a/include/routing/IAmRoutingSend.h b/include/routing/IAmRoutingSend.h index b08346c..4280931 100644 --- a/include/routing/IAmRoutingSend.h +++ b/include/routing/IAmRoutingSend.h @@ -1,5 +1,4 @@ /**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -15,13 +14,13 @@ *
* \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
*
- * \file CAmCommandReceiver.h
+ * \file
* For further information see http://www.genivi.org/.
*
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#if !defined(EA_8E1C613C_7F9E_41d0_B333_97EDB669B542__INCLUDED_)
-#define EA_8E1C613C_7F9E_41d0_B333_97EDB669B542__INCLUDED_
+#if !defined(EA_39D31D03_9B43_4dfe_B134_B2A969767ECB__INCLUDED_)
+#define EA_39D31D03_9B43_4dfe_B134_B2A969767ECB__INCLUDED_
#include <vector>
#include <string>
@@ -45,7 +44,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n
* For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:50 AM + * @created 06-Mar-2012 8:01:09 PM */ class IAmRoutingSend { @@ -206,4 +205,4 @@ namespace am { }; } -#endif // !defined(EA_8E1C613C_7F9E_41d0_B333_97EDB669B542__INCLUDED_) +#endif // !defined(EA_39D31D03_9B43_4dfe_B134_B2A969767ECB__INCLUDED_) diff --git a/include/shared/CAmDbusWrapper.h b/include/shared/CAmDbusWrapper.h index c89220f..6efbc9e 100644 --- a/include/shared/CAmDbusWrapper.h +++ b/include/shared/CAmDbusWrapper.h @@ -1,5 +1,5 @@ -/** Copyright (c) 2012 GENIVI Alliance - * Copyright (c) 2012 BMW +/** + * Copyright (C) 2012, BMW AG * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * diff --git a/include/shared/CAmDltWrapper.h b/include/shared/CAmDltWrapper.h index f3d39cc..19f5257 100644 --- a/include/shared/CAmDltWrapper.h +++ b/include/shared/CAmDltWrapper.h @@ -1,5 +1,5 @@ -/** Copyright (c) 2012 GENIVI Alliance - * Copyright (c) 2012 BMW +/** + * Copyright (C) 2012, BMW AG * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * @@ -24,63 +24,60 @@ #ifdef WITH_DLT #include <dlt/dlt.h> +namespace am +{ #else - -#include <cstdint> +#include <stdint.h> #include <sstream> -namespace am +#define DLT_USER_BUF_MAX_SIZE 2048 + +/** + * This structure is used for every context used in an application. + */ +typedef struct { + char contextID[4]; /**< context id */ + int32_t log_level_pos; /**< offset in user-application context field */ +} DltContext; -#define DLT_USER_BUF_MAX_SIZE 2048 +/** + * Definitions of DLT log level + */ +typedef enum +{ + DLT_LOG_DEFAULT = -1, /**< Default log level */ + DLT_LOG_OFF = 0x00, /**< Log level off */ + DLT_LOG_FATAL = 0x01, /**< fatal system error */ + DLT_LOG_ERROR = 0x02, /**< error with impact to correct functionality */ + DLT_LOG_WARN = 0x03, /**< warning, correct behaviour could not be ensured */ + DLT_LOG_INFO = 0x04, /**< informational */ + DLT_LOG_DEBUG = 0x05, /**< debug */ + DLT_LOG_VERBOSE = 0x06 /**< highest grade of information */ +} DltLogLevelType; - /** - * This structure is used for every context used in an application. - */ - typedef struct - { - char contextID[4]; /**< context id */ - int32_t log_level_pos; /**< offset in user-application context field */ - }DltContext; - - /** - * Definitions of DLT log level - */ - typedef enum - { - DLT_LOG_DEFAULT = -1, /**< Default log level */ - DLT_LOG_OFF = 0x00, /**< Log level off */ - DLT_LOG_FATAL = 0x01, /**< fatal system error */ - DLT_LOG_ERROR = 0x02, /**< error with impact to correct functionality */ - DLT_LOG_WARN = 0x03, /**< warning, correct behaviour could not be ensured */ - DLT_LOG_INFO = 0x04, /**< informational */ - DLT_LOG_DEBUG = 0x05, /**< debug */ - DLT_LOG_VERBOSE = 0x06 /**< highest grade of information */ - }DltLogLevelType; - - /** - * This structure is used for context data used in an application. - */ - typedef struct - { - DltContext *handle; /**< pointer to DltContext */ - std::stringstream buffer; /**< buffer for building log message*/ - int32_t log_level; /**< log level */ - int32_t trace_status; /**< trace status */ - int32_t args_num; /**< number of arguments for extended header*/ - uint8_t mcnt; /**< message counter */ - char* context_description; /**< description of context */ - }DltContextData; +/** + * This structure is used for context data used in an application. + */ +typedef struct +{ + DltContext *handle; /**< pointer to DltContext */ + std::stringstream buffer; /**< buffer for building log message*/ + int32_t log_level; /**< log level */ + int32_t trace_status; /**< trace status */ + int32_t args_num; /**< number of arguments for extended header*/ + uint8_t mcnt; /**< message counter */ + char* context_description; /**< description of context */ +} DltContextData; #define DLT_DECLARE_CONTEXT(CONTEXT) \ DltContext CONTEXT; #define DLT_IMPORT_CONTEXT(CONTEXT) \ extern DltContext CONTEXT; - -#endif // WITH_DLT namespace am { +#endif // WITH_DLT /** * Wraps around the dlt. This class is instantiated as a singleton and offers a default @@ -114,8 +111,8 @@ public: private: CAmDltWrapper(const bool enableNoDLTDebug); //is private because of singleton pattern #ifndef WITH_DLT - template<class T> void appendNoDLT(T value); - bool mEnableNoDLTDebug; + template<class T> void appendNoDLT(T value); + bool mEnableNoDLTDebug; #endif DltContext mDltContext; //!< the default context DltContextData mDltContextData; //!< contextdata diff --git a/include/shared/CAmSerializer.h b/include/shared/CAmSerializer.h index 03935f4..ef6484f 100644 --- a/include/shared/CAmSerializer.h +++ b/include/shared/CAmSerializer.h @@ -1,5 +1,5 @@ -/** Copyright (c) 2012 GENIVI Alliance - * Copyright (c) 2012 BMW +/** + * Copyright (C) 2012, BMW AG * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * diff --git a/include/shared/CAmSocketHandler.h b/include/shared/CAmSocketHandler.h index 8df6872..ba54b00 100644 --- a/include/shared/CAmSocketHandler.h +++ b/include/shared/CAmSocketHandler.h @@ -1,5 +1,5 @@ -/** Copyright (c) 2012 GENIVI Alliance - * Copyright (c) 2012 BMW +/** + * Copyright (C) 2012, BMW AG * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * |
