detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 08:17:13 +02:00
Code Issues Actions Packages Releases Activity

Add slsReceiverUsers(int tcpip_port_no) overload

Browse Source 
Use std::unique_ptr<> instead of raw pointers
This commit is contained in:
Samuel Debionne
2019-02-12 16:23:55 +01:00
parent 031a11c4f7
commit b18391330e
4 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsReceiverSoftware/include/slsReceiver.h
View File

@ -4,10 +4,9 @@
* @short creates the UDP and TCP class objects
***********************************************/
#include <memory>
class slsReceiverTCPIPInterface;
#include "slsReceiverTCPIPInterface.h"
#include "sls_detector_defs.h"
@ -27,11 +26,15 @@ class slsReceiver : private virtual slsDetectorDefs {
* @param argv from command line
*/
slsReceiver(int argc, char *argv[]);
/**
* Destructor
* Constructor
* Starts up a Receiver server. Reads configuration file, options, and
* assembles a Receiver using TCP and UDP detector interfaces
* throws an exception in case of failure
* @param tcpip_port_no TCP/IP port number
*/
~slsReceiver();
slsReceiver(int tcpip_port_no = 1954);
/**
* starts listening on the TCP port for client comminication
@ -95,6 +98,5 @@ class slsReceiver : private virtual slsDetectorDefs {
private:
slsReceiverTCPIPInterface* tcpipInterface;
std::unique_ptr<slsReceiverTCPIPInterface> tcpipInterface;
};

18
slsReceiverSoftware/include/slsReceiverUsers.h
View File

@ -3,8 +3,9 @@
#include <stdio.h>
#include <stdint.h>
#include <memory>
class slsReceiver;
#include "slsReceiver.h"
/**
@short Class for implementing the SLS data receiver in the users application. Callbacks can be defined for processing and/or saving data
@ -23,10 +24,14 @@ public:
* @param success socket creation was successfull
*/
slsReceiverUsers(int argc, char *argv[], int &success);
/** Destructor */
~slsReceiverUsers();
/**
* Constructor
* reads config file, creates socket, assigns function table
* @param tcpip_port_no TCP/IP port
* @throws
*/
slsReceiverUsers(int tcpip_port_no = 1954);
/**
* starts listening on the TCP port for client comminication
@ -83,6 +88,5 @@ public:
char* datapointer, uint32_t &revDatasize, void*),void *arg);
//receiver object
slsReceiver* receiver;
std::unique_ptr<slsReceiver> receiver;
};