changed daemon directory name
authorchristian mueller <christian.ei.mueller@bmw.de>
Fri, 1 Jul 2011 12:50:34 +0000 (14:50 +0200)
committerchristian mueller <christian.ei.mueller@bmw.de>
Fri, 1 Jul 2011 12:50:34 +0000 (14:50 +0200)
changed absolute path for doxygen to relative path

35 files changed:
AudioManGUI/Doxyfile.in
AudioManagerDaemon/AudioManagerCore.cpp [moved from AudioManagerDeamon/AudioManagerCore.cpp with 100% similarity]
AudioManagerDaemon/AudioManagerCore.h [moved from AudioManagerDeamon/AudioManagerCore.h with 100% similarity]
AudioManagerDaemon/CMakeLists.txt [moved from AudioManagerDeamon/CMakeLists.txt with 100% similarity]
AudioManagerDaemon/DBusCommandInterface.cpp [moved from AudioManagerDeamon/DBusCommandInterface.cpp with 100% similarity]
AudioManagerDaemon/DBusCommandInterface.h [moved from AudioManagerDeamon/DBusCommandInterface.h with 100% similarity]
AudioManagerDaemon/DataBaseHandler.cpp [moved from AudioManagerDeamon/DataBaseHandler.cpp with 100% similarity]
AudioManagerDaemon/DataBaseHandler.h [moved from AudioManagerDeamon/DataBaseHandler.h with 100% similarity]
AudioManagerDaemon/Doxyfile.in [moved from AudioManagerDeamon/Doxyfile.in with 99% similarity]
AudioManagerDaemon/HookEngine.cpp [moved from AudioManagerDeamon/HookEngine.cpp with 100% similarity]
AudioManagerDaemon/HookEngine.h [moved from AudioManagerDeamon/HookEngine.h with 100% similarity]
AudioManagerDaemon/Router.cpp [moved from AudioManagerDeamon/Router.cpp with 100% similarity]
AudioManagerDaemon/Router.h [moved from AudioManagerDeamon/Router.h with 100% similarity]
AudioManagerDaemon/RoutingReceive.cpp [moved from AudioManagerDeamon/RoutingReceive.cpp with 100% similarity]
AudioManagerDaemon/RoutingReceive.h [moved from AudioManagerDeamon/RoutingReceive.h with 100% similarity]
AudioManagerDaemon/audioManagerIncludes.h [moved from AudioManagerDeamon/audioManagerIncludes.h with 100% similarity]
AudioManagerDaemon/dataTypes.h [moved from AudioManagerDeamon/dataTypes.h with 100% similarity]
AudioManagerDaemon/main.cpp [moved from AudioManagerDeamon/main.cpp with 100% similarity]
AudioManagerDaemon/mainpage.h [moved from AudioManagerDeamon/mainpage.h with 100% similarity]
AudioManagerDaemon/routinginterface.h [moved from AudioManagerDeamon/routinginterface.h with 100% similarity]
PlayerGUI/Doxyfile.in
PluginRoutingInterfaceDbus/CMakeLists.txt
PluginRoutingInterfaceDbus/Doxyfile.in
PluginRoutingInterfaceJack/CMakeLists.txt
PluginRoutingInterfaceJack/Doxyfile.in
PluginStructuralTest/CMakeLists.txt
PluginStructuralTest/Doxyfile.in
README
pluginRoutingInterfaceTCP/CMakeLists.txt [new file with mode: 0644]
pluginRoutingInterfaceTCP/RoutingSend.cpp [new file with mode: 0644]
pluginRoutingInterfaceTCP/RoutingSend.h [new file with mode: 0644]
pluginRoutingInterfaceTCP/TcpServer.cpp [new file with mode: 0644]
pluginRoutingInterfaceTCP/TcpServer.h [new file with mode: 0644]
pluginRoutingInterfaceTCP/tcpClient.cpp [new file with mode: 0644]
pluginRoutingInterfaceTCP/tcpClient.h [new file with mode: 0644]

index cbd42ac..2d9095f 100644 (file)
@@ -590,7 +590,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = /home/blacky/workspace/AudioManGUI
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
similarity index 99%
rename from AudioManagerDeamon/Doxyfile.in
rename to AudioManagerDaemon/Doxyfile.in
index fbb3169..bb1ef58 100644 (file)
@@ -590,7 +590,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = /home/blacky/workspace/AudioManagerDeamon
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
@@ -801,7 +801,7 @@ COLS_IN_ALPHA_INDEX    = 5
 # should be ignored while generating the index headers.
 
 IGNORE_PREFIX          = 
-dbus
+
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
index e07f616..29ddfc4 100644 (file)
@@ -590,7 +590,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = /home/blacky/workspace/PlayerGUI
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
index c5fa002..ed15031 100644 (file)
@@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES(
        ${STD_INCLUDE_DIRS}
        ${CMAKE_CURRENT_BINARY_DIR}
        ${DBUS_FOLDER}
-       ../AudioManagerDeamon
+       ../AudioManagerDaemon
 )
 
 # add Qt modules here, the include will setup QT_LIBRARIES
index 8cd2e46..9a193ed 100644 (file)
@@ -590,7 +590,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = /home/blacky/workspace/PluginRoutingInterfaceDbus
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
index 5c52bdb..cbd3f38 100644 (file)
@@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES(
        ${STD_INCLUDE_DIRS}
        ${GLIB_INCLUDE_DIRS}
        ${JACK_INCLUDE_DIRS}
-       ../AudioManagerDeamon
+       ../AudioManagerDaemon
 )
 
 LINK_DIRECTORIES(
index 8cdca51..a19e1c1 100644 (file)
@@ -115,7 +115,7 @@ INLINE_INHERITED_MEMB  = NO
 # path before files name in the file list and in the header files. If set 
 # to NO the shortest path that makes the file name unique will be used.
 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
@@ -590,7 +590,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = /home/blacky/workspace/PluginRoutingInterfaceJack
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
index 8e62162..aae04c4 100644 (file)
@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(
        ${CMAKE_CURRENT_BINARY_DIR}
        ${QT_INCLUDE_DIR} 
        ${DBUS_FOLDER}
-       ../AudioManagerDeamon
+       ../AudioManagerDaemon
 )
 
 # defines for QL Plugins
index 41bb583..aa7eed3 100644 (file)
@@ -590,7 +590,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = /home/blacky/workspace/PluginStructuralTest
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
diff --git a/README b/README
index ce3425b..9a22c7e 100644 (file)
--- a/README
+++ b/README
@@ -175,7 +175,7 @@ If you want to have the same as the demo in Dublin, start now the jack equalizer
 
 Now it's time to start pulseaudio, since we need to start it with a special configuration, get into the pulseaudio directory and run
 
-       src/pulseaudio -n -F src/default.pa -p $(pwd)/src/.libs/ -vvvv
+       src/pulseaudio -n -F src/test.pa -p $(pwd)/src/.libs/ -vvvv
 
 The next step is to start the DLT server
 
diff --git a/pluginRoutingInterfaceTCP/CMakeLists.txt b/pluginRoutingInterfaceTCP/CMakeLists.txt
new file mode 100644 (file)
index 0000000..48e5290
--- /dev/null
@@ -0,0 +1,70 @@
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(PluginRoutingInterfaceTCP)
+
+set(CMAKE_CXX_FLAGS "-g -pipe -fPIC -Wall -W -D_REENTRANT")
+
+set(STD_INCLUDE_DIRS "/usr/include")
+set(EXECUTABLE_OUTPUT_PATH ../../bin/)
+set(LIBRARY_OUTPUT_PATH ../plugins)
+set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../dbusInterfaces)
+
+cmake_policy(SET CMP0015 NEW)
+
+FIND_PACKAGE(Qt4 REQUIRED)
+FIND_PACKAGE(PkgConfig)
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+
+INCLUDE_DIRECTORIES(
+       include
+       ${CMAKE_SOURCE_DIR} 
+       ${STD_INCLUDE_DIRS}
+       ${GLIB_INCLUDE_DIRS}
+       ${DBUS_FOLDER}
+       ../AudioManagerDaemon
+)
+
+LINK_DIRECTORIES(
+       ${LINK_DIRECTORIES}
+       ${GLIB_LIBRARY_DIRS}
+)
+
+# add Qt modules here, the include will setup QT_LIBRARIES
+SET(QT_USE_QTNETWORK TRUE)
+
+# defines for QL Plugins
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_STATICPLUGIN)
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_SHARED)
+
+
+
+INCLUDE(${QT_USE_FILE})
+
+# all source files go here
+SET(PLUGINJACK_SRCS_CXX 
+    RoutingSend.cpp 
+    tcpClient.cpp
+    TcpServer.cpp
+)
+
+# every header that contains QT stuff like Q_OBJECT .... and must be mocced
+SET(PLUGINJACK_MOC_SRCS
+    RoutingSend.h 
+    tcpClient.h
+    TcpServer.h
+)
+
+#now take the headers, moc them and append the resulting moc files to the sources
+QT4_WRAP_CPP(PLUGINJACK_SRCS_CXX ${PLUGINJACK_MOC_SRCS})
+
+add_library(RoutingTcpPlugin ${PLUGINJACK_SRCS_CXX})
+
+TARGET_LINK_LIBRARIES(RoutingTcpPlugin
+       ${QT_LIBRARIES}
+)
+
+
+
+
diff --git a/pluginRoutingInterfaceTCP/RoutingSend.cpp b/pluginRoutingInterfaceTCP/RoutingSend.cpp
new file mode 100644 (file)
index 0000000..71829ac
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ * Bus_Interface.cpp
+ *
+ *  Created on: Jan 19, 2011
+ *      Author: demo
+ */
+#include <iostream>
+
+
+#include "RoutingSend.h"
+#include "routinginterface.h"
+#include "tcpMessages.h"
+
+
+using namespace std;
+
+
+void RoutingSendTcp::startup_interface(RoutingReceiveInterface* audioman){
+       audiomanager=audioman;
+       m_server=new TcpServer(AUDIOMAN_PORT);
+       m_client=new tcpClient(BEAGLE_IP,BEAGLE_PORT);
+       m_server->registerAudioManager(audiomanager);
+       cout<<"server started"<<endl;
+}
+
+void RoutingSendTcp::return_BusName(char* BusName) {
+       strcpy(BusName,BUS_NAME);
+}
+
+int RoutingSendTcp::Connect(int source, int sink){
+       return m_client->connect(source,sink);
+}
+
+void RoutingSendTcp::system_ready() {
+
+       m_client->system_ready();
+       cout<<"Tcp ready"<<endl;
+
+}
+
+
+RoutingSendInterface* SampleRoutingInterfaceTcpFactory::returnInstance(){
+       return new RoutingSendTcp();
+}
+
+Q_EXPORT_PLUGIN2(RoutingTcpPlugin, SampleRoutingInterfaceTcpFactory);
diff --git a/pluginRoutingInterfaceTCP/RoutingSend.h b/pluginRoutingInterfaceTCP/RoutingSend.h
new file mode 100644 (file)
index 0000000..30518a6
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Bus_Interface.h
+ *
+ *  Created on: Feb 24, 2011
+ *      Author: demo
+ */
+
+#ifndef BUS_INTERFACE_H_
+#define BUS_INTERFACE_H_
+
+#include <qplugin.h>
+#include "routinginterface.h"
+#include "TcpServer.h"
+#include "tcpClient.h"
+
+#define BUS_NAME "TCP"
+
+class RoutingSendTcp: public RoutingSendInterface
+{
+Q_OBJECT
+public:
+       void startup_interface(RoutingReceiveInterface * audioman);
+       void return_BusName(char * BusName);
+       int Connect(int source, int sink);
+public slots:
+       void system_ready();
+
+private:
+       RoutingReceiveInterface *audiomanager;
+       TcpServer* m_server;
+       tcpClient* m_client;
+};
+
+//That is the actual implementation of the Factory Class returning the real Interface
+
+class SampleRoutingInterfaceTcpFactory: public QObject, public RoutingInterfaceFactory
+{
+Q_OBJECT
+Q_INTERFACES(RoutingInterfaceFactory)
+public:
+       RoutingSendInterface* returnInstance();
+};
+
+#endif /* BUS_INTERFACE_H_ */
diff --git a/pluginRoutingInterfaceTCP/TcpServer.cpp b/pluginRoutingInterfaceTCP/TcpServer.cpp
new file mode 100644 (file)
index 0000000..1e63f8b
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * TcpServer.cpp
+ *
+ *  Created on: Apr 6, 2011
+ *      Author: blacky
+ */
+
+#include "TcpServer.h"
+
+#include <iostream>
+#include <QList>
+#include <QByteArray>
+
+using namespace std;
+
+TcpServer::TcpServer(int ListenPort) {
+        connect(this, SIGNAL(newConnection()), this, SLOT(receivedCommand()));
+        if (! this->listen(QHostAddress::Any,ListenPort)) {
+                cout<<" Problem: "<<this->errorString().toStdString()<<endl;
+        }
+}
+
+TcpServer::~TcpServer() {
+       // TODO Auto-generated destructor stub
+}
+
+void TcpServer::registerAudioManager(RoutingReceiveInterface *audiomanager_) {
+       audiomanager=audiomanager_;
+}
+
+void TcpServer::receivedCommand() {
+       socket=this->nextPendingConnection ();
+       connect(socket, SIGNAL(readyRead()), this, SLOT(startRead()));
+       cout<<"got new command"<<endl;
+}
+
+void TcpServer::startRead() {
+       QByteArray buffer;
+       int answer;
+       bool earlyMode=false;
+       buffer=socket->readAll();
+       QList<QByteArray> bList=buffer.split('#');
+       switch (bList.at(0).toInt()) {
+               case MSG_registerDomain:
+                       if (QString(bList.at(4))=="true") {
+                               earlyMode=true;
+                       }
+                       answer=audiomanager->registerDomain((char*)bList.at(1).data(),(char*)bList.at(2).data(),(char*)bList.at(3).data(),earlyMode);
+                       socket->write(QByteArray::number(answer));
+                       break;
+               case MSG_registerGateway:
+                       answer=audiomanager->registerGateway((char*)bList.at(1).data(),(char*)bList.at(2).data(),(char*)bList.at(3).data(),(char*)bList.at(4).data(),(char*)bList.at(5).data(),(char*)bList.at(6).data());
+                       socket->write(QByteArray::number(answer));
+                       break;
+               case MSG_registerSink:
+                       answer=audiomanager->registerSink((char*)bList.at(1).data(),(char*)bList.at(2).data(),(char*)bList.at(3).data());
+                       socket->write(QByteArray::number(answer));
+                       break;
+               case MSG_registerSource:
+                       answer=audiomanager->registerSource((char*)bList.at(1).data(),(char*)bList.at(2).data(),(char*)bList.at(3).data());
+                       socket->write(QByteArray::number(answer));
+                       break;
+               case MSG_peekDomain:
+                       answer=audiomanager->peekDomain((char*)bList.at(1).data());
+                       socket->write(QByteArray::number(answer));
+                       break;
+       }
+}
diff --git a/pluginRoutingInterfaceTCP/TcpServer.h b/pluginRoutingInterfaceTCP/TcpServer.h
new file mode 100644 (file)
index 0000000..32f9745
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * TcpServer.h
+ *
+ *  Created on: Apr 6, 2011
+ *      Author: blacky
+ */
+
+#ifndef I2CSERVER_H_
+#define I2CSERVER_H_
+
+#include <QtNetwork>
+#include <QObject>
+
+#include "routinginterface.h"
+#include "tcpMessages.h"
+
+class TcpServer : public QTcpServer{
+Q_OBJECT
+public:
+       TcpServer(int ListenPort);
+       virtual ~TcpServer();
+
+       void registerAudioManager(RoutingReceiveInterface *audiomanager_);
+
+public slots:
+       void receivedCommand();
+       void startRead();
+
+private:
+       QTcpSocket* socket;
+       RoutingReceiveInterface *audiomanager;
+};
+
+#endif /* I2CSERVER_H_ */
diff --git a/pluginRoutingInterfaceTCP/tcpClient.cpp b/pluginRoutingInterfaceTCP/tcpClient.cpp
new file mode 100644 (file)
index 0000000..b2aefe3
--- /dev/null
@@ -0,0 +1,62 @@
+/*
+ * udpClient.cpp
+ *
+ *  Created on: Apr 6, 2011
+ *      Author: blacky
+ */
+
+#include "tcpClient.h"
+#include <iostream>
+
+using namespace std;
+
+tcpClient::tcpClient(QString serverIP_, int serverPort_) {
+       serverIP=serverIP_;
+       serverPort=serverPort_;
+       QObject::connect(this, SIGNAL(connected()), this, SLOT(sendOut()));
+}
+
+tcpClient::~tcpClient() {
+       // TODO Auto-generated destructor stub
+}
+
+int tcpClient::connect(int source, int sink) {
+
+       sendBuffer.clear();
+       sendBuffer.append(QByteArray::number(MSG_CONNECT));
+       sendBuffer.append('#');
+       sendBuffer.append(QByteArray::number(source));
+       sendBuffer.append('#');
+       sendBuffer.append(QByteArray::number(sink));
+       if (send()) {
+               this->waitForReadyRead(CONNECT_TIMEOUT);
+               return this->readAll().toInt();
+       } else {
+               return -1;
+       }
+
+}
+
+void tcpClient::system_ready() {
+
+       sendBuffer.clear();
+       sendBuffer.append(QByteArray::number(SIG_system_ready));
+       send();
+}
+
+bool tcpClient::send() {
+       QHostAddress adr;
+       adr.setAddress(serverIP);
+       this->connectToHost(adr,serverPort);
+    if (!this->waitForConnected(CONNECT_TIMEOUT)) {
+        cout<<"No connection"<<endl;
+        return false;
+    } else {
+       cout<<"got connection"<<endl;
+       return true;
+    }
+}
+
+void tcpClient::sendOut() {
+       this->write(sendBuffer);
+}
diff --git a/pluginRoutingInterfaceTCP/tcpClient.h b/pluginRoutingInterfaceTCP/tcpClient.h
new file mode 100644 (file)
index 0000000..1d93246
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ * udpClient.h
+ *
+ *  Created on: Apr 6, 2011
+ *      Author: blacky
+ */
+#ifndef UDPCLIENT_H_
+#define UDPCLIENT_H_
+
+#include <QtNetwork>
+#include "tcpMessages.h"
+
+class tcpClient : public QTcpSocket
+{
+Q_OBJECT
+public:
+       tcpClient(QString serverIP, int serverPort);
+       virtual ~tcpClient();
+
+       int connect(int source, int sink);
+       void system_ready();
+
+       bool send();
+
+public slots:
+       void sendOut();
+
+
+private:
+       QString serverIP;
+       int serverPort;
+       QByteArray sendBuffer;
+
+};
+
+#endif /* UDPCLIENT_H_ */