receiver tcp interface updated

slsReceiverSoftware/include/slsReceiverTCPIPInterface.h

@@ -106,27 +106,12 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
 	 */
 	void startTCPServer();
 
-	/** retuns function name with function index */
-	const char* getFunctionName(enum detFuncs func);
-
 	/** assigns functions to the fnum enum */
 	int function_table();
 
 	/** Decodes Function */
 	int decode_function();
 
-	/** print socket read error */
-	int printSocketReadError();
-
-	/** receiver object is null */
-	void invalidReceiverObject();
-
-	/** receiver already locked */
-	void receiverlocked();
-
-	/** receiver not idle */
-	void receiverNotIdle();
-
 	/** function not implemented for specific detector */
 	void functionNotImplemented();
 
@@ -287,7 +272,7 @@ class slsReceiverTCPIPInterface : private virtual slsDetectorDefs {
 	detectorType myDetectorType;
 
 	/** slsReceiverBase object */
-	slsReceiverImplementation *receiverBase;
+	slsReceiverImplementation *receiver;
 
 	/** Function List */
 	int (slsReceiverTCPIPInterface::*flist[NUM_REC_FUNCTIONS])();
@@ -371,5 +356,5 @@ protected:
 	MySocketTCP* mySock;
 
 	/** client interface */
-	ClientInterface* clientInterface;
+	ClientInterface* interface;
 };

slsReceiverSoftware/src/slsReceiverImplementation.cpp

@@ -372,11 +372,13 @@ uint32_t slsReceiverImplementation::getFifoDepth() const{
 /***receiver status***/
 slsDetectorDefs::runStatus slsReceiverImplementation::getStatus() const{
     FILE_LOG(logDEBUG) << __AT__ << " starting";
-    return status;}
+    return status;
+}
 
 bool slsReceiverImplementation::getSilentMode() const{
     FILE_LOG(logDEBUG) << __AT__ << " starting";
-    return silentMode;}
+    return silentMode;
+}
 
 bool slsReceiverImplementation::getActivate() const{
     FILE_LOG(logDEBUG) << __AT__ << " starting";