update & cleanup

4 files changed, 79 insertions, 63 deletions

diff --git a/PluginRoutingInterfaceDbus/DBusInterface.cpp b/PluginRoutingInterfaceDbus/DBusInterface.cpp
index 6cc2144..cf4b8f4 100644
--- a/PluginRoutingInterfaceDbus/DBusInterface.cpp
+++ b/PluginRoutingInterfaceDbus/DBusInterface.cpp
@@ -29,48 +29,54 @@
 
 using namespace std;
 
-DBusInterface::DBusInterface(QObject* parent){
-
+DBusInterface::DBusInterface(QObject* parent) {
+	(void) parent;
 }
 
 void DBusInterface::setReceiverInterface(RoutingReceiveInterface* r_interface) {
-	audiomanager=r_interface;
+	audiomanager = r_interface;
 }
 
 int DBusInterface::peekDomain(const QString &name) {
-	QByteArray b_name  = name.toAscii();
-	char * c_name    = b_name.data();
+	QByteArray b_name = name.toAscii();
+	char * c_name = b_name.data();
 	return audiomanager->peekDomain(c_name);
 }
 
-int DBusInterface::registerSource(const QString &name, const QString &audioclass, const QString &domain) {
-	QByteArray b_name  = name.toAscii();
-	QByteArray b_audioclass  = audioclass.toAscii();
-	QByteArray b_domain  = domain.toAscii();
-	char * c_name    = b_name.data();
+int DBusInterface::registerSource(const QString &name,
+		const QString &audioclass, const QString &domain) {
+	QByteArray b_name = name.toAscii();
+	QByteArray b_audioclass = audioclass.toAscii();
+	QByteArray b_domain = domain.toAscii();
+	char * c_name = b_name.data();
 	char * c_audioclass = b_audioclass.data();
 	char * c_domain = b_domain.data();
-	return audiomanager->registerSource(c_name,c_audioclass,c_domain);
+	return audiomanager->registerSource(c_name, c_audioclass, c_domain);
 }
-int DBusInterface::registerSink(const QString &name, const QString &sinkclass, const QString &domain) {
-	QByteArray b_name  = name.toAscii();
-	QByteArray b_sinkclass  = sinkclass.toAscii();
-	QByteArray b_domain  = domain.toAscii();
-	char * c_name    = b_name.data();
+int DBusInterface::registerSink(const QString &name, const QString &sinkclass,
+		const QString &domain) {
+	QByteArray b_name = name.toAscii();
+	QByteArray b_sinkclass = sinkclass.toAscii();
+	QByteArray b_domain = domain.toAscii();
+	char * c_name = b_name.data();
 	char * c_sinkclass = b_sinkclass.data();
 	char * c_domain = b_domain.data();
-	return audiomanager->registerSink(c_name,c_sinkclass,c_domain);
+	return audiomanager->registerSink(c_name, c_sinkclass, c_domain);
 }
-int DBusInterface::registerDomain(const QString &name, const QString &node, bool earlymode) {
-	QByteArray b_name  = name.toAscii();
-	QByteArray b_nodeame  = node.toAscii();
-	char* c_name= b_name.data();
-	char* c_nodename=b_nodeame.data();
+int DBusInterface::registerDomain(const QString &name, const QString &node,
+		bool earlymode) {
+	QByteArray b_name = name.toAscii();
+	QByteArray b_nodeame = node.toAscii();
+	char* c_name = b_name.data();
+	char* c_nodename = b_nodeame.data();
 	char c_busname[20];
-	strcpy(c_busname,BUS_NAME);
-	return audiomanager->registerDomain(c_name,c_busname,c_nodename,earlymode);
+	strcpy(c_busname, BUS_NAME);
+	return audiomanager->registerDomain(c_name, c_busname, c_nodename,
+			earlymode);
 }
-int DBusInterface::registerGateway(const QString &name, const QString &sink, const QString &source, const QString &domainSource, const QString &domainSink, const QString &controlDomain) {
+int DBusInterface::registerGateway(const QString &name, const QString &sink,
+		const QString &source, const QString &domainSource,
+		const QString &domainSink, const QString &controlDomain) {
 	QByteArray b_name = name.toAscii();
 	QByteArray b_sink = sink.toAscii();
 	QByteArray b_source = source.toAscii();
@@ -83,7 +89,8 @@ int DBusInterface::registerGateway(const QString &name, const QString &sink, con
 	char* c_domainSource = b_domainSource.data();
 	char* c_domainSink = b_domainSink.data();
 	char* c_controlDomain = b_controlDomain.data();
-	return audiomanager->registerGateway(c_name,c_sink,c_source,c_domainSource,c_domainSink,c_controlDomain);
+	return audiomanager->registerGateway(c_name, c_sink, c_source,
+			c_domainSource, c_domainSink, c_controlDomain);
 }
 void DBusInterface::emitSystemReady() {
 	emit signal_systemReady();
diff --git a/PluginRoutingInterfaceDbus/DBusInterface.h b/PluginRoutingInterfaceDbus/DBusInterface.h
index c5e6fe0..e094ae5 100644
--- a/PluginRoutingInterfaceDbus/DBusInterface.h
+++ b/PluginRoutingInterfaceDbus/DBusInterface.h
@@ -28,7 +28,7 @@
 #include "DBusInterfaceAdaptor.h"
 #include "routinginterface.h"
 
-class DBusInterface : public QObject {
+class DBusInterface: public QObject {
 	Q_OBJECT
 public:
 	DBusInterface(QObject *parent = 0);
@@ -37,12 +37,17 @@ public:
 
 public Q_SLOTS: // METHODS
 	int peekDomain(const QString &name);
-    int registerDomain(const QString &name, const QString &node, bool earlymode);
-    int registerGateway(const QString &name, const QString &sink, const QString &source, const QString &domainSource, const QString &domainSink, const QString &controlDomain);
-    int registerSink(const QString &name, const QString &sinkclass, const QString &domain);
-    int registerSource(const QString &name, const QString &audioclass, const QString &domain);
+	int
+	registerDomain(const QString &name, const QString &node, bool earlymode);
+	int registerGateway(const QString &name, const QString &sink,
+			const QString &source, const QString &domainSource,
+			const QString &domainSink, const QString &controlDomain);
+	int registerSink(const QString &name, const QString &sinkclass,
+			const QString &domain);
+	int registerSource(const QString &name, const QString &audioclass,
+			const QString &domain);
 Q_SIGNALS: // SIGNALS
-    void signal_systemReady();
+	void signal_systemReady();
 
 private:
 	RoutingReceiveInterface* audiomanager;
diff --git a/PluginRoutingInterfaceDbus/RoutingSend.cpp b/PluginRoutingInterfaceDbus/RoutingSend.cpp
index 9aeecac..d568f85 100644
--- a/PluginRoutingInterfaceDbus/RoutingSend.cpp
+++ b/PluginRoutingInterfaceDbus/RoutingSend.cpp
@@ -22,18 +22,18 @@
  * 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.
  */
 
-
 #include "RoutingSend.h"
 #include "DBusInterface.h"
 using namespace std;
 
-DLT_DECLARE_CONTEXT(DBusPlugin);
+DLT_DECLARE_CONTEXT( DBusPlugin);
 
 RoutingSend::RoutingSend() :
-	m_connection(QDBusConnection::sessionBus()), m_sender("org.genivi.pulse", "/pulse", m_connection) {
-	DLT_REGISTER_APP("DBusPlugin","DBusPlugin");
-	DLT_REGISTER_CONTEXT(DBusPlugin,"Main","Main Context");
-	DLT_LOG(DBusPlugin,DLT_LOG_INFO, DLT_STRING("The DBus Plugin is started"));
+	m_connection(QDBusConnection::sessionBus()),
+			m_sender("org.genivi.pulse", "/pulse", m_connection) {
+	DLT_REGISTER_APP("DBusPlugin", "DBusPlugin");
+	DLT_REGISTER_CONTEXT(DBusPlugin, "Main", "Main Context");
+	DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("The DBus Plugin is started"));
 }
 
 void RoutingSend::startup_interface(RoutingReceiveInterface* audioman) {
@@ -41,7 +41,7 @@ void RoutingSend::startup_interface(RoutingReceiveInterface* audioman) {
 
 	DBusInterface* dbInterface = new DBusInterface;
 	receiver = dbInterface;
-	DLT_LOG(DBusPlugin,DLT_LOG_INFO, DLT_STRING("DBus Interface started "));
+	DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("DBus Interface started "));
 
 	new DBusInterfaceAdaptor(dbInterface);
 	//	sender = new DBusSend();
@@ -50,11 +50,16 @@ void RoutingSend::startup_interface(RoutingReceiveInterface* audioman) {
 	QString Servicename = "com.Genivi.routinginterface";
 	m_connection.registerService(Servicename);
 	if (m_connection.isConnected()) {
-		if (m_connection.registerObject("/Hello", dbInterface,
-				(QDBusConnection::ExportAdaptors | QDBusConnection::ExportAllSignals))) {
-			DLT_LOG(DBusPlugin,DLT_LOG_INFO, DLT_STRING("Registered DBus succsessfully"));
+		if (m_connection.registerObject(
+				"/Hello",
+				dbInterface,
+				(QDBusConnection::ExportAdaptors
+						| QDBusConnection::ExportAllSignals))) {
+			DLT_LOG(DBusPlugin, DLT_LOG_INFO,
+					DLT_STRING("Registered DBus succsessfully"));
 		} else {
-			DLT_LOG(DBusPlugin,DLT_LOG_ERROR, DLT_STRING("Registered DBus succsessfully"));
+			DLT_LOG(DBusPlugin, DLT_LOG_ERROR,
+					DLT_STRING("Registered DBus succsessfully"));
 		}
 	}
 
@@ -65,55 +70,57 @@ void RoutingSend::return_BusName(char* BusName) {
 	strcpy(BusName, BUS_NAME);
 }
 
-connection_t RoutingSend::connect(source_t source, sink_t sink, connection_t connID) {
-	QDBusPendingReply<int> pendingCall = m_sender.connect((int)source, (int)sink, (int)connID);
+connection_t RoutingSend::connect(source_t source, sink_t sink,
+		connection_t connID) {
+	QDBusPendingReply<int> pendingCall = m_sender.connect((int) source,
+			(int) sink, (int) connID);
 	pendingCall.waitForFinished();
-	return (connection_t)pendingCall.value();
+	return (connection_t) pendingCall.value();
 }
 
 void RoutingSend::slot_system_ready() {
-	DLT_LOG(DBusPlugin,DLT_LOG_INFO, DLT_STRING("DBus Plugin ready"));
+	DLT_LOG(DBusPlugin, DLT_LOG_INFO, DLT_STRING("DBus Plugin ready"));
 	receiver->emitSystemReady();
 }
 
 bool RoutingSend::disconnect(connection_t connectionID) {
-	if (m_sender.disconnect((int)connectionID)<0) {
+	if (m_sender.disconnect((int) connectionID) < 0) {
 		return true;
 	}
 	return false;
 }
 
 volume_t RoutingSend::setSinkVolume(volume_t volume, sink_t sink) {
-	return (volume_t) m_sender.setSinkVolume((int)volume,(int)sink);
+	return (volume_t) m_sender.setSinkVolume((int) volume, (int) sink);
 }
 
 volume_t RoutingSend::setSourceVolume(volume_t volume, source_t source) {
-	return (volume_t) m_sender.setSourceVolume((int)volume,(int)source);
+	return (volume_t) m_sender.setSourceVolume((int) volume, (int) source);
 }
 
 bool RoutingSend::muteSource(source_t sourceID) {
-	if (m_sender.muteSource((int)sourceID)<0) {
+	if (m_sender.muteSource((int) sourceID) < 0) {
 		return true;
 	}
 	return false;
 }
 
 bool RoutingSend::muteSink(sink_t sinkID) {
-	if (m_sender.muteSink((int)sinkID)<0) {
+	if (m_sender.muteSink((int) sinkID) < 0) {
 		return true;
 	}
 	return false;
 }
 
 bool RoutingSend::unmuteSource(source_t sourceID) {
-	if (m_sender.unmuteSource((int)sourceID)<0) {
+	if (m_sender.unmuteSource((int) sourceID) < 0) {
 		return true;
 	}
 	return false;
 }
 
 bool RoutingSend::unmuteSink(sink_t sinkID) {
-	if (m_sender.unmuteSink((int)sinkID)<0) {
+	if (m_sender.unmuteSink((int) sinkID) < 0) {
 		return true;
 	}
 	return false;
diff --git a/PluginRoutingInterfaceDbus/RoutingSend.h b/PluginRoutingInterfaceDbus/RoutingSend.h
index 9f847a7..508614e 100644
--- a/PluginRoutingInterfaceDbus/RoutingSend.h
+++ b/PluginRoutingInterfaceDbus/RoutingSend.h
@@ -33,13 +33,11 @@
 
 #define BUS_NAME "DBUS"
 
-
 /**Implementation of the interface
  *
  */
-class RoutingSend: public RoutingSendInterface
-{
-Q_OBJECT
+class RoutingSend: public RoutingSendInterface {
+	Q_OBJECT
 public:
 	RoutingSend();
 	void startup_interface(RoutingReceiveInterface * audioman);
@@ -53,7 +51,6 @@ public:
 	bool unmuteSource(source_t sourceID);
 	bool unmuteSink(sink_t sinkID);
 
-
 public slots:
 	virtual void slot_system_ready();
 
@@ -66,10 +63,10 @@ private:
 
 //That is the actual implementation of the Factory Class returning the real sendInterface
 
-class SampleRoutingInterfaceFactory: public QObject, public RoutingInterfaceFactory
-{
-Q_OBJECT
-Q_INTERFACES(RoutingInterfaceFactory)
+class SampleRoutingInterfaceFactory: public QObject,
+		public RoutingInterfaceFactory {
+	Q_OBJECT
+	Q_INTERFACES(RoutingInterfaceFactory)
 public:
 	RoutingSendInterface* returnInstance();
 };