* fix [GAM-28] problems in routingsender.cpp

* [GAM-27] major refactoring: bringing everything to standardized names
* Enhancement of CAmSerializer.h
* improvement of documentation
* adoption & regeneration of inerfaces

2 files changed, 0 insertions, 275 deletions

diff --git a/includes/dbus/CommandInterface.xml b/includes/dbus/CommandInterface.xml
deleted file mode 100644
index f6f07a0..0000000
--- a/includes/dbus/CommandInterface.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<!DOCTYPE node PUBLIC

-  "-//freedesktop//DTD D-Bus Object Introspection 1.0//EN"

-  "http://standards.freedesktop.org/dbus/1.0/introspect.dtd">

-

-<node>

-     <interface name="org.genivi.audiomanager.CommandInterface">

-

-        <method name="Connect">

-            <arg type="q" name="sourceID" direction="in"/>

-            <arg type="q" name="sinkID" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="q" name="mainConnectionID" direction="out"/>

-        </method>

-

-        <method name="Disconnect">

-            <arg type="q" name="mainConnectionID" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-        </method>

-

-        <method name="SetVolume">

-            <arg type="q" name="sinkID" direction="in"/>

-            <arg type="n" name="volume" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-        </method>

-

-        <method name="VolumeStep">

-            <arg type="q" name="sinkID" direction="in"/>

-            <arg type="n" name="volumeStep" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-        </method>

-

-        <method name="SetSinkMuteState">

-            <arg type="q" name="sinkID" direction="in"/>

-            <arg type="n" name="muteState" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-        </method>

-

-        <method name="SetMainSinkSoundProperty">

-            <arg type="q" name="sinkID" direction="in"/>

-            <arg type="(nn)" name="soundProperty" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-        </method>

-

-        <method name="SetMainSourceSoundProperty">

-            <arg type="q" name="sourceID" direction="in"/>

-            <arg type="(nn)" name="soundProperty" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-        </method>

-

-        <method name="SetSystemProperty">

-            <arg type="(nn)" name="property" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-        </method>

-

-        <method name="GetListMainConnections">

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="a(qqqnn)" name="listConnections" direction="out"/> <!-- am_mainConnectionID_t mainConnectionID; am_sourceID_t sourceID; am_sinkID_t sinkID; am_timeSync_t delay; am_ConnectionState_e connectionState; -->

-        </method>

-

-        <method name="GetListMainSinks">

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="a(qs(nn)nnq)" name="listMainSinks" direction="out"/> <!-- am_sinkID_t sinkID; std::string name; am_Availability_s availability; am_mainVolume_t volume; am_MuteState_e muteState; am_sinkClass_t sinkClassID; -->

-        </method>

-

-        <method name="GetListMainSources">

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="a(qs(nn)q)" name="listMainSources" direction="out"/> <!-- am_sourceID_t sourceID; std::string name; am_Availability_s availability; am_sourceClass_t sourceClassID; -->

-        </method>

-

-        <method name="GetListMainSinkSoundProperties">

-            <arg type="q" name="sinkID" direction="in"/> 

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="a(nn)" name="listSoundProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->

-        </method>

-

-        <method name="GetListMainSourceSoundProperties">

-            <arg type="q" name="sourceID" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="a(nn)" name="listSourceProperties" direction="out"/> <!-- am_MainSoundPropertyType_e type; int16_t value; -->

-        </method>

-

-        <method name="GetListSourceClasses">

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="a(qsa(nn))" name="listSourceClasses" direction="out"/> <!-- am_sourceClass_t SourceClassID; std::string name; std::vector<am_ClassProperty_s> listClassProperties; -->

-        </method>

-

-        <method name="GetListSinkClasses">

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="a(qsa(nn))" name="listSinkClasses" direction="out"/> <!-- am_sourceClass_t SinkClassID; std::string name; std::vector<am_ClassProperty_s> listClassProperties; -->

-        </method>

-

-        <method name="GetListSystemProperties">

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="a(nn)" name="listSystemProperties" direction="in"/> <!-- am_SystemProperty_e type; int16_t value; -->

-        </method>

-

-        <method name="GetTimingInformation">

-            <arg type="q" name="mainConnectionID" direction="in"/>

-            <arg type="n" name="result" direction="out"/> <!-- method return code (am_Error_e) -->

-            <arg type="n" name="delay" direction="out"/>

-        </method>

-

-        <signal name="NumberOfMainConnectionsChanged">

-        </signal>

-

-	<signal name="SinkAdded">

-            	<arg type="(qs(nn)nnq)" name="newSink" direction="out"/><!-- am_sinkID_t sinkID; std::string name; am_Availability_s availability; am_mainVolume_t volume; am_MuteState_e muteState; am_sinkClass_t sinkClassID; -->

-        </signal>

-		

-	<signal name="SinkRemoved">

-		<arg type="q" name="removedSinkID" direction="out"/>

-        </signal>

-

-	<signal name="SourceAdded">

-            	<arg type="(qs(nn)q)" name="newSource" direction="out"/><!-- am_sourceID_t sourceID; std::string name; 	am_Availability_s availability; am_sourceClass_t sourceClassID; -->

-        </signal>

-		

-	<signal name="SourceRemoved">

-		<arg type="q" name="removedSourceID" direction="out"/>

-        </signal>

-

-        <signal name="NumberOfSinkClassesChanged">

-        </signal>

-

-        <signal name="NumberOfSourceClassesChanged">

-        </signal>

-

-        <signal name="MainConnectionStateChanged">

-            <arg type="q" name="connectionID" direction="out"/>

-            <arg type="n" name="connectionState" direction="out"/>

-        </signal>

-

-        <signal name="MainSinkSoundPropertyChanged">

-            <arg type="q" name="sinkID" direction="out"/>

-            <arg type="(nn)" name="SoundProperty" direction="out"/>

-        </signal>

-

-        <signal name="MainSourceSoundPropertyChanged">

-            <arg type="q" name="sourceID" direction="out"/>

-            <arg type="(nn)" name="SoundProperty" direction="out"/>

-        </signal>

-

-        <signal name="SinkAvailabilityChanged">

-            <arg type="q" name="sinkID" direction="out"/>

-            <arg type="(nn)" name="availability" direction="out"/>

-        </signal>

-

-        <signal name="SourceAvailabilityChanged">

-            <arg type="q" name="sourceID" direction="out"/>

-            <arg type="(nn)" name="availability" direction="out"/>

-        </signal>

-

-        <signal name="VolumeChanged">

-            <arg type="q" name="sinkID" direction="out"/>

-            <arg type="n" name="volume" direction="out"/>

-        </signal>

-

-        <signal name="SinkMuteStateChanged">

-            <arg type="q" name="sinkID" direction="out"/>

-            <arg type="n" name="muteState" direction="out"/>

-        </signal>

-

-            <signal name="SystemPropertyChanged">

-            <arg type="(nn)" name="SystemProperty" direction="out"/>

-        </signal>

-

-        <signal name="TimingInformationChanged">

-            <arg type="q" name="mainConnection" direction="out"/>

-            <arg type="n" name="time" direction="out"/>

-        </signal>

-

-    </interface>

-</node>

diff --git a/includes/dbus/DBusWrapper.h b/includes/dbus/DBusWrapper.h
deleted file mode 100644
index 76fd2c1..0000000
--- a/includes/dbus/DBusWrapper.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright (C) 2011, BMW AG
- *
- * GeniviAudioMananger AudioManagerDaemon
- *
- * \file DBusWrapper.h
- *
- * \date 20-Oct-2011 3:42:04 PM
- * \author Christian Mueller (christian.ei.mueller@bmw.de)
- *
- * \section License
- * GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
- * Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
- * You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
- * Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
- * As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
- * Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
- *
- * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
- */
-
-#ifndef DBUSWRAPPER_H_
-#define DBUSWRAPPER_H_
-
-#include <config.h>
-#include <SocketHandler.h>
-#include <dbus/dbus.h>
-#include <string>
-#include <list>
-
-namespace am
-{
-/**
- * This wraps dbus and provides everything needed to anyone who wants to use dbus (including plugins)
- */
-class DBusWrapper
-{
-public:
-    DBusWrapper(SocketHandler* socketHandler);
-    virtual ~DBusWrapper();
-
-    /**
-     * registers a callback that is entered as path below the main path.
-     * The configuration of the mainpath is done via DBusConfiguration.h
-     * @param vtable the vtable that holds a pointer to the callback that is called when the path is called from the dbus
-     * @param path the name of the path
-     * @param userdata pointer to the class that will handle the callback
-     */
-    void registerCallback(const DBusObjectPathVTable* vtable, const std::string& path, void* userdata);
-
-    /**
-     * returns the dbus connection
-     * @param connection pointer to the connection
-     */
-    void getDBusConnection(DBusConnection*& connection) const;
-
-    static dbus_bool_t addWatch(DBusWatch *watch, void *userData);
-    static void removeWatch(DBusWatch *watch, void *userData);
-    static void toogleWatch(DBusWatch *watch, void *userData);
-
-    static dbus_bool_t addTimeout(DBusTimeout *timeout, void* userData);
-    static void removeTimeout(DBusTimeout *timeout, void* userData);
-    static void toggleTimeout(DBusTimeout *timeout, void* userData);
-
-    bool dbusDispatchCallback(const sh_pollHandle_t handle, void* userData);
-    shPollDispatch_T<DBusWrapper> pDbusDispatchCallback;
-
-    void dbusFireCallback(const pollfd pollfd, const sh_pollHandle_t handle, void* userData);
-    shPollFired_T<DBusWrapper> pDbusFireCallback;
-
-    bool dbusCheckCallback(const sh_pollHandle_t handle, void* userData);
-    shPollCheck_T<DBusWrapper> pDbusCheckCallback;
-
-    void dbusTimerCallback(sh_timerHandle_t handle, void* userData);
-    shTimerCallBack_T<DBusWrapper> pDbusTimerCallback;
-
-private:
-    static DBusWrapper* mReference;
-    static DBusHandlerResult cbRootIntrospection(DBusConnection *conn, DBusMessage *msg, void *reference);
-    dbus_bool_t addWatchDelegate(DBusWatch * watch, void* userData);
-    void removeWatchDelegate(DBusWatch *watch, void *userData);
-    void toogleWatchDelegate(DBusWatch *watch, void *userData);
-    dbus_bool_t addTimeoutDelegate(DBusTimeout *timeout, void* userData);
-    void removeTimeoutDelegate(DBusTimeout *timeout, void* userData);
-    void toggleTimeoutDelegate(DBusTimeout *timeout, void* userData);
-    DBusObjectPathVTable mObjectPathVTable;
-    DBusConnection* mDbusConnection;
-    DBusError mDBusError;
-    std::list<std::string> mNodesList;
-    std::vector<sh_timerHandle_t*> mListTimerhandlePointer;
-    SocketHandler *mSocketHandler;
-    std::map<DBusWatch*, sh_pollHandle_t> mMapHandleWatch;
-};
-
-}
-
-#endif /* DBUSWRAPPER_H_ */