From e6ad5d883663688d0e36e9d506aa9a1f1190c47f Mon Sep 17 00:00:00 2001 From: christian mueller Date: Fri, 1 Jul 2011 14:50:34 +0200 Subject: [PATCH] changed daemon directory name changed absolute path for doxygen to relative path --- AudioManGUI/Doxyfile.in | 2 +- .../AudioManagerCore.cpp | 0 .../AudioManagerCore.h | 0 .../CMakeLists.txt | 0 .../DBusCommandInterface.cpp | 0 .../DBusCommandInterface.h | 0 .../DataBaseHandler.cpp | 0 .../DataBaseHandler.h | 0 .../Doxyfile.in | 4 +- .../HookEngine.cpp | 0 .../HookEngine.h | 0 .../Router.cpp | 0 .../Router.h | 0 .../RoutingReceive.cpp | 0 .../RoutingReceive.h | 0 .../audioManagerIncludes.h | 0 .../dataTypes.h | 0 .../main.cpp | 0 .../mainpage.h | 0 .../routinginterface.h | 0 PlayerGUI/Doxyfile.in | 2 +- PluginRoutingInterfaceDbus/CMakeLists.txt | 2 +- PluginRoutingInterfaceDbus/Doxyfile.in | 2 +- PluginRoutingInterfaceJack/CMakeLists.txt | 2 +- PluginRoutingInterfaceJack/Doxyfile.in | 4 +- PluginStructuralTest/CMakeLists.txt | 2 +- PluginStructuralTest/Doxyfile.in | 2 +- README | 2 +- pluginRoutingInterfaceTCP/CMakeLists.txt | 70 ++++++++++++++++++++++ pluginRoutingInterfaceTCP/RoutingSend.cpp | 46 ++++++++++++++ pluginRoutingInterfaceTCP/RoutingSend.h | 44 ++++++++++++++ pluginRoutingInterfaceTCP/TcpServer.cpp | 68 +++++++++++++++++++++ pluginRoutingInterfaceTCP/TcpServer.h | 34 +++++++++++ pluginRoutingInterfaceTCP/tcpClient.cpp | 62 +++++++++++++++++++ pluginRoutingInterfaceTCP/tcpClient.h | 36 +++++++++++ 35 files changed, 372 insertions(+), 12 deletions(-) rename {AudioManagerDeamon => AudioManagerDaemon}/AudioManagerCore.cpp (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/AudioManagerCore.h (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/CMakeLists.txt (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/DBusCommandInterface.cpp (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/DBusCommandInterface.h (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/DataBaseHandler.cpp (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/DataBaseHandler.h (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/Doxyfile.in (99%) rename {AudioManagerDeamon => AudioManagerDaemon}/HookEngine.cpp (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/HookEngine.h (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/Router.cpp (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/Router.h (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/RoutingReceive.cpp (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/RoutingReceive.h (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/audioManagerIncludes.h (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/dataTypes.h (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/main.cpp (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/mainpage.h (100%) rename {AudioManagerDeamon => AudioManagerDaemon}/routinginterface.h (100%) create mode 100644 pluginRoutingInterfaceTCP/CMakeLists.txt create mode 100644 pluginRoutingInterfaceTCP/RoutingSend.cpp create mode 100644 pluginRoutingInterfaceTCP/RoutingSend.h create mode 100644 pluginRoutingInterfaceTCP/TcpServer.cpp create mode 100644 pluginRoutingInterfaceTCP/TcpServer.h create mode 100644 pluginRoutingInterfaceTCP/tcpClient.cpp create mode 100644 pluginRoutingInterfaceTCP/tcpClient.h diff --git a/AudioManGUI/Doxyfile.in b/AudioManGUI/Doxyfile.in index cbd42ac..2d9095f 100644 --- a/AudioManGUI/Doxyfile.in +++ b/AudioManGUI/Doxyfile.in @@ -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 diff --git a/AudioManagerDeamon/AudioManagerCore.cpp b/AudioManagerDaemon/AudioManagerCore.cpp similarity index 100% rename from AudioManagerDeamon/AudioManagerCore.cpp rename to AudioManagerDaemon/AudioManagerCore.cpp diff --git a/AudioManagerDeamon/AudioManagerCore.h b/AudioManagerDaemon/AudioManagerCore.h similarity index 100% rename from AudioManagerDeamon/AudioManagerCore.h rename to AudioManagerDaemon/AudioManagerCore.h diff --git a/AudioManagerDeamon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt similarity index 100% rename from AudioManagerDeamon/CMakeLists.txt rename to AudioManagerDaemon/CMakeLists.txt diff --git a/AudioManagerDeamon/DBusCommandInterface.cpp b/AudioManagerDaemon/DBusCommandInterface.cpp similarity index 100% rename from AudioManagerDeamon/DBusCommandInterface.cpp rename to AudioManagerDaemon/DBusCommandInterface.cpp diff --git a/AudioManagerDeamon/DBusCommandInterface.h b/AudioManagerDaemon/DBusCommandInterface.h similarity index 100% rename from AudioManagerDeamon/DBusCommandInterface.h rename to AudioManagerDaemon/DBusCommandInterface.h diff --git a/AudioManagerDeamon/DataBaseHandler.cpp b/AudioManagerDaemon/DataBaseHandler.cpp similarity index 100% rename from AudioManagerDeamon/DataBaseHandler.cpp rename to AudioManagerDaemon/DataBaseHandler.cpp diff --git a/AudioManagerDeamon/DataBaseHandler.h b/AudioManagerDaemon/DataBaseHandler.h similarity index 100% rename from AudioManagerDeamon/DataBaseHandler.h rename to AudioManagerDaemon/DataBaseHandler.h diff --git a/AudioManagerDeamon/Doxyfile.in b/AudioManagerDaemon/Doxyfile.in similarity index 99% rename from AudioManagerDeamon/Doxyfile.in rename to AudioManagerDaemon/Doxyfile.in index fbb3169..bb1ef58 100644 --- a/AudioManagerDeamon/Doxyfile.in +++ b/AudioManagerDaemon/Doxyfile.in @@ -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 #--------------------------------------------------------------------------- diff --git a/AudioManagerDeamon/HookEngine.cpp b/AudioManagerDaemon/HookEngine.cpp similarity index 100% rename from AudioManagerDeamon/HookEngine.cpp rename to AudioManagerDaemon/HookEngine.cpp diff --git a/AudioManagerDeamon/HookEngine.h b/AudioManagerDaemon/HookEngine.h similarity index 100% rename from AudioManagerDeamon/HookEngine.h rename to AudioManagerDaemon/HookEngine.h diff --git a/AudioManagerDeamon/Router.cpp b/AudioManagerDaemon/Router.cpp similarity index 100% rename from AudioManagerDeamon/Router.cpp rename to AudioManagerDaemon/Router.cpp diff --git a/AudioManagerDeamon/Router.h b/AudioManagerDaemon/Router.h similarity index 100% rename from AudioManagerDeamon/Router.h rename to AudioManagerDaemon/Router.h diff --git a/AudioManagerDeamon/RoutingReceive.cpp b/AudioManagerDaemon/RoutingReceive.cpp similarity index 100% rename from AudioManagerDeamon/RoutingReceive.cpp rename to AudioManagerDaemon/RoutingReceive.cpp diff --git a/AudioManagerDeamon/RoutingReceive.h b/AudioManagerDaemon/RoutingReceive.h similarity index 100% rename from AudioManagerDeamon/RoutingReceive.h rename to AudioManagerDaemon/RoutingReceive.h diff --git a/AudioManagerDeamon/audioManagerIncludes.h b/AudioManagerDaemon/audioManagerIncludes.h similarity index 100% rename from AudioManagerDeamon/audioManagerIncludes.h rename to AudioManagerDaemon/audioManagerIncludes.h diff --git a/AudioManagerDeamon/dataTypes.h b/AudioManagerDaemon/dataTypes.h similarity index 100% rename from AudioManagerDeamon/dataTypes.h rename to AudioManagerDaemon/dataTypes.h diff --git a/AudioManagerDeamon/main.cpp b/AudioManagerDaemon/main.cpp similarity index 100% rename from AudioManagerDeamon/main.cpp rename to AudioManagerDaemon/main.cpp diff --git a/AudioManagerDeamon/mainpage.h b/AudioManagerDaemon/mainpage.h similarity index 100% rename from AudioManagerDeamon/mainpage.h rename to AudioManagerDaemon/mainpage.h diff --git a/AudioManagerDeamon/routinginterface.h b/AudioManagerDaemon/routinginterface.h similarity index 100% rename from AudioManagerDeamon/routinginterface.h rename to AudioManagerDaemon/routinginterface.h diff --git a/PlayerGUI/Doxyfile.in b/PlayerGUI/Doxyfile.in index e07f616..29ddfc4 100644 --- a/PlayerGUI/Doxyfile.in +++ b/PlayerGUI/Doxyfile.in @@ -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 diff --git a/PluginRoutingInterfaceDbus/CMakeLists.txt b/PluginRoutingInterfaceDbus/CMakeLists.txt index c5fa002..ed15031 100644 --- a/PluginRoutingInterfaceDbus/CMakeLists.txt +++ b/PluginRoutingInterfaceDbus/CMakeLists.txt @@ -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 diff --git a/PluginRoutingInterfaceDbus/Doxyfile.in b/PluginRoutingInterfaceDbus/Doxyfile.in index 8cd2e46..9a193ed 100644 --- a/PluginRoutingInterfaceDbus/Doxyfile.in +++ b/PluginRoutingInterfaceDbus/Doxyfile.in @@ -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 diff --git a/PluginRoutingInterfaceJack/CMakeLists.txt b/PluginRoutingInterfaceJack/CMakeLists.txt index 5c52bdb..cbd3f38 100644 --- a/PluginRoutingInterfaceJack/CMakeLists.txt +++ b/PluginRoutingInterfaceJack/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES( ${STD_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${JACK_INCLUDE_DIRS} - ../AudioManagerDeamon + ../AudioManagerDaemon ) LINK_DIRECTORIES( diff --git a/PluginRoutingInterfaceJack/Doxyfile.in b/PluginRoutingInterfaceJack/Doxyfile.in index 8cdca51..a19e1c1 100644 --- a/PluginRoutingInterfaceJack/Doxyfile.in +++ b/PluginRoutingInterfaceJack/Doxyfile.in @@ -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 diff --git a/PluginStructuralTest/CMakeLists.txt b/PluginStructuralTest/CMakeLists.txt index 8e62162..aae04c4 100644 --- a/PluginStructuralTest/CMakeLists.txt +++ b/PluginStructuralTest/CMakeLists.txt @@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR} ${DBUS_FOLDER} - ../AudioManagerDeamon + ../AudioManagerDaemon ) # defines for QL Plugins diff --git a/PluginStructuralTest/Doxyfile.in b/PluginStructuralTest/Doxyfile.in index 41bb583..aa7eed3 100644 --- a/PluginStructuralTest/Doxyfile.in +++ b/PluginStructuralTest/Doxyfile.in @@ -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 --- 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 index 0000000..48e5290 --- /dev/null +++ b/pluginRoutingInterfaceTCP/CMakeLists.txt @@ -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 index 0000000..71829ac --- /dev/null +++ b/pluginRoutingInterfaceTCP/RoutingSend.cpp @@ -0,0 +1,46 @@ +/* + * Bus_Interface.cpp + * + * Created on: Jan 19, 2011 + * Author: demo + */ +#include + + +#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"<connect(source,sink); +} + +void RoutingSendTcp::system_ready() { + + m_client->system_ready(); + cout<<"Tcp ready"< +#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 index 0000000..1e63f8b --- /dev/null +++ b/pluginRoutingInterfaceTCP/TcpServer.cpp @@ -0,0 +1,68 @@ +/* + * TcpServer.cpp + * + * Created on: Apr 6, 2011 + * Author: blacky + */ + +#include "TcpServer.h" + +#include +#include +#include + +using namespace std; + +TcpServer::TcpServer(int ListenPort) { + connect(this, SIGNAL(newConnection()), this, SLOT(receivedCommand())); + if (! this->listen(QHostAddress::Any,ListenPort)) { + cout<<" Problem: "<errorString().toStdString()<nextPendingConnection (); + connect(socket, SIGNAL(readyRead()), this, SLOT(startRead())); + cout<<"got new command"<readAll(); + QList 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 index 0000000..32f9745 --- /dev/null +++ b/pluginRoutingInterfaceTCP/TcpServer.h @@ -0,0 +1,34 @@ +/* + * TcpServer.h + * + * Created on: Apr 6, 2011 + * Author: blacky + */ + +#ifndef I2CSERVER_H_ +#define I2CSERVER_H_ + +#include +#include + +#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 index 0000000..b2aefe3 --- /dev/null +++ b/pluginRoutingInterfaceTCP/tcpClient.cpp @@ -0,0 +1,62 @@ +/* + * udpClient.cpp + * + * Created on: Apr 6, 2011 + * Author: blacky + */ + +#include "tcpClient.h" +#include + +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"<write(sendBuffer); +} diff --git a/pluginRoutingInterfaceTCP/tcpClient.h b/pluginRoutingInterfaceTCP/tcpClient.h new file mode 100644 index 0000000..1d93246 --- /dev/null +++ b/pluginRoutingInterfaceTCP/tcpClient.h @@ -0,0 +1,36 @@ +/* + * udpClient.h + * + * Created on: Apr 6, 2011 + * Author: blacky + */ +#ifndef UDPCLIENT_H_ +#define UDPCLIENT_H_ + +#include +#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_ */ -- 2.7.4