Some changes, renaming...

2 files changed, 6 insertions, 7 deletions

diff --git a/AudioManagerDaemon/include/ControlLoader.h b/AudioManagerDaemon/include/ControlSender.h
index 09ffacf..fde029c 100644
--- a/AudioManagerDaemon/include/ControlLoader.h
+++ b/AudioManagerDaemon/include/ControlSender.h
@@ -12,13 +12,10 @@
 
 using namespace am;
 
-class ControlLoader {
+class ControlSender : private ControlSendInterface {
 public:
-	ControlLoader();
-	virtual ~ControlLoader();
-	ControlSendInterface* returnControl();
-private:
-	ControlSendInterface* mControler;
+	ControlSender();
+	virtual ~ControlSender();
 };
 
 #endif /* CONTROLLOADER_H_ */
diff --git a/AudioManagerDaemon/include/DatabaseHandler.h b/AudioManagerDaemon/include/DatabaseHandler.h
index 6b2c2be..5c99719 100644
--- a/AudioManagerDaemon/include/DatabaseHandler.h
+++ b/AudioManagerDaemon/include/DatabaseHandler.h
@@ -137,10 +137,12 @@ public:
 	bool existSourceClass(const am_sourceClass_t sourceClassID) const;
 
 private:
+	am_timeSync_t calculateMainConnectionDelay(const am_mainConnectionID_t mainConnectionID) const;
+	bool connectionPartofMainConnection(const am_connectionID_t connectionID,const am_mainConnectionID_t mainConnectionID) const;
 	bool sqQuery(const std::string& query);
 	bool openDatabase();
 	void createTables();
-	sqlite3 *mDatabase; //!< pointer to database
+	sqlite3 *mDatabase;
 	std::string mPath;
 	bool mFirstStaticSink;
 	bool mFirstStaticSource;